/juju

Removed some dependencies on being able to iterate over maps in a predictable order. #1718

Merged
merged 31 commits into from Mar 4, 2015

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@dooferlad @jujubot @themue @howbazaar @axw
@dooferlad
Contributor

dooferlad commented Mar 2, 2015

fixes: 1427149

(Review request: http://reviews.vapour.ws/r/1048/)

dooferlad and others added some commits Mar 2, 2015

@dooferlad
Removed some dependencies on being able to iterate over maps in a pre… 
…dictable order.
9dac57c
@themue
Ported fix #1425435 from 1.22 to master
7bd3309
@dooferlad
ListServicesCommand now returns a predictable string. 
checkCreateFileCall copes with ini checker errors.
Added gcfg dependency to dependencies.tsv
Fixes from review.
c573c66
@dooferlad
Cope with volumes being in in any order.
d0d2c81
@dooferlad
Resored missing check.
5c93c2b
@dooferlad
linuxExecutables is now an array so we don't need to do any key sorti… 
…ng to get a consistent result out of ListServicesCommand.
148da8d
@howbazaar
Introduce 'juju environment create'
dfeb375
@howbazaar
Tweak some comments.
d61716b
@axw
worker/provisioner: use lxc host arch in FindTools 
When calling FindTools, LXC provisioners should
override the environment constraints with the
arch of the host machine.

Fixes https://bugs.launchpad.net/juju-core/+bug/1420049
a08b2cb
@jujubot
Merge pull request #1731 from howbazaar/juju-environment-create 
Introduce 'juju environment create'

This is protected by the 'jes' feature flag.
1e3a2d6
@axw
worker/provisioner: fix test names
233c680
@axw
service: predictable ListServicesCommand output 
ListServicesCommand iterates over a map to generate
a command. We were previously relying on service
listing commands being predictable, and this new
behaviour is not, since iterating over a map is
pseudo-random. We change the function to iterate
over the sorted map keys instead.
57af5eb
@axw
cmd/juju/environment: add missing formatting
b2400f2
@jujubot
Merge pull request #1735 from axw/lp1420049-lxc-provisioner-override-… 
…constraints-arch

worker/provisioner: use lxc host arch in FindTools

When calling FindTools, LXC provisioners should
override the environment constraints with the
arch of the host machine.

Fixes https://bugs.launchpad.net/juju-core/+bug/1420049

(Review request: http://reviews.vapour.ws/r/1065/)
587b430
@jujubot
Merge pull request #1738 from axw/service-sort-command 
service: predictable ListServicesCommand output

ListServicesCommand iterates over a map to generate a command. We were
previously relying on service listing commands being predictable, and this
new behaviour is not, since iterating over a map is pseudo-random. We
change the function to iterate over the sorted map keys instead.

Also:
    cmd/juju/environment: add missing formatting

(Review request: http://reviews.vapour.ws/r/1068/)
8ec1c65
@jujubot
Merge pull request #1737 from howbazaar/enable-provider-prepare-create 
Enable provider prepare create

Enable ec2 and maas for multiple environments.

(Review request: http://reviews.vapour.ws/r/1067/)
2d5676e
@jujubot
Merge pull request #1720 from TheMue/fix-1425435-master 
Ported fix #1425435 from 1.22 to master



(Review request: http://reviews.vapour.ws/r/1050/)
1852e2d
@dooferlad
Simplification based on review. 
Removed dependency on gcfg.
6b9c97a
@dooferlad
Removed some dependencies on being able to iterate over maps in a pre… 
…dictable order.
e61c885
@dooferlad
ListServicesCommand now returns a predictable string. 
checkCreateFileCall copes with ini checker errors.
Added gcfg dependency to dependencies.tsv
Fixes from review.
308a9e7
@dooferlad
Cope with volumes being in in any order.
c588102
@dooferlad
Resored missing check.
c79dd6c
@dooferlad
linuxExecutables is now an array so we don't need to do any key sorti… 
…ng to get a consistent result out of ListServicesCommand.
33fa350
@dooferlad
Simplification based on review. 
Removed dependency on gcfg.
51ed845
@dooferlad
SameContents is getting the changes that were going into SameContents… 
…Deref, so this is simplified.
96608ed
@dooferlad
Remove obsolete dep
7be6aff
@dooferlad
Cleaned up new test TestInstallCommandsShutdown. 
Addressed review comments.
Merged upstream.
Updated juju/testing rev in dependencies.tsv
33c4ec4
@dooferlad
Merge remote-tracking branch 'origin/master-map-ordering-tests' into … 
…master-map-ordering-tests
17ab34b
@dooferlad
Minor cleanups to reduce diff noise.
02e9a0d
@dooferlad
Removed code.google.com/p/gcfg
e15c92a
@dooferlad
Contributor

dooferlad commented Mar 4, 2015

$$go$$
@jujubot
Contributor

jujubot commented Mar 4, 2015

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju
@jujubot
Contributor

jujubot commented Mar 4, 2015

Build failed: Generating tarball failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/2384
@dooferlad
Contributor

dooferlad commented Mar 4, 2015

$$a$$
@jujubot
Contributor

jujubot commented Mar 4, 2015

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

jujubot added a commit that referenced this pull request Mar 4, 2015

@jujubot
Merge pull request #1718 from dooferlad/master-map-ordering-tests 
Removed some dependencies on being able to iterate over maps in a predictable order.

fixes: 1427149

(Review request: http://reviews.vapour.ws/r/1048/)
1e85bff

@jujubot jujubot merged commit 1e85bff into juju:master Mar 4, 2015

@dooferlad dooferlad deleted the dooferlad:master-map-ordering-tests branch Mar 12, 2015

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