/juju

Merge develop into 2.0 #6505

Merged
merged 2 commits into from Oct 26, 2016

Conversation

Reviewers

@mjs mjs

@wallyworld wallyworld

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@kat-co @mjs @wallyworld @jujubot
@kat-co
Contributor

kat-co commented Oct 26, 2016

No description provided.

jujubot added some commits Oct 26, 2016

@jujubot @kat-co
Merge pull request #6502 from mjs/ssh-test-fixes 
cmd/juju/command: Fix SSH/SCP test failures

A recent change updated the unit tests for `juju ssh` and `juju scp` in such a way that they weren't deterministic any more and frequently failed. This change limits the fake machine addresses that the tests
will use to make them deterministic and reliable again.

Several hours of race stress test runs. Previously these tests would fail in a handful of iterations.
b6eca99
@jujubot @kat-co
Merge pull request #6501 from axw/lp1636648-openstack-update-goose 
provider/openstack: update goose

Use new version of goose, to omit the device
field on volume attachment requests when no
device is specified.

This branch also uses the new OpenStack API
version discovery code in goose.

Fixes https://bugs.launchpad.net/juju/+bug/1636648
3c91301
@mjs

mjs approved these changes Oct 26, 2016
View changes

@kat-co kat-co merged commit 907b86d into juju:2.0 Oct 26, 2016

@nskaggs nskaggs referenced this pull request Oct 27, 2016

Merged

Revert "Merge develop into 2.0" #6509

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment