lp:~fwereade/pyjuju/fix-cluster-instances

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:~fwereade/pyjuju/pa-start-machine-constraints

William Reade: Pending requested 2012-03-20

Diff: 1407 lines (+482/-214)

27 files modified

juju/agents/tests/test_provision.py (+2/-2)
juju/control/add_unit.py (+13/-0)
juju/control/bootstrap.py (+5/-0)
juju/control/deploy.py (+13/-2)
juju/control/legacy.py (+29/-0)
juju/control/tests/test_constraints_set.py (+1/-1)
juju/control/tests/test_deploy.py (+1/-1)
juju/environment/config.py (+47/-52)
juju/environment/tests/test_config.py (+65/-11)
juju/machine/constraints.py (+34/-29)
juju/machine/tests/test_constraints.py (+44/-29)
juju/providers/common/base.py (+4/-0)
juju/providers/common/tests/test_base.py (+4/-0)
juju/providers/dummy.py (+3/-0)
juju/providers/ec2/__init__.py (+11/-0)
juju/providers/ec2/launch.py (+5/-6)
juju/providers/ec2/tests/common.py (+2/-1)
juju/providers/ec2/tests/test_launch.py (+9/-7)
juju/providers/ec2/tests/test_provider.py (+17/-0)
juju/providers/ec2/tests/test_utils.py (+82/-34)
juju/providers/ec2/utils.py (+30/-33)
juju/state/environment.py (+6/-1)
juju/state/machine.py (+1/-2)
juju/state/service.py (+2/-2)
juju/state/tests/test_machine.py (+14/-0)
juju/state/tests/test_service.py (+38/-0)
juju/state/tests/test_utils.py (+0/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

470. By William Reade on 2012-03-23

control tests fixed, new behaviour not tested yet

469. By William Reade on 2012-03-23

juju.control broken tests, otherwise good (?)

468. By William Reade on 2012-03-22

removed unfixable warnings; improved any constraints handling tests; made environment config more consistent and better tested

467. By William Reade on 2012-03-21

tests for old node format (ie no constraints key)

466. By William Reade on 2012-03-21

many fixes

465. By William Reade on 2012-03-20

arch now defaults to amd64 and no longer conflicts with ec2-instance-type; hvm images will now be chosen for cluster instance types

464. By William Reade on 2012-03-20

merge parent, address review

463. By William Reade on 2012-03-15

fix tests to deal with default 64-bitness

462. By William Reade on 2012-03-15

merge parent

461. By William Reade on 2012-03-15

initial cut at ec2 instance/arch/pricing changes