lp:~fwereade/pyjuju/old-twisted-test-fix

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:pyjuju at revision 522

Kapil Thangavelu (community): Approve on 2012-04-11

Diff: 36 lines (+7/-4)

2 files modified

juju/providers/ec2/tests/test_utils.py (+5/-3)
juju/providers/ec2/utils.py (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

523. By William Reade on 2012-04-11

merge parent

522. By William Reade on 2012-04-11

pep8

521. By William Reade on 2012-04-11

tests now pass against older twisted

520. By Clint Byrum on 2012-04-11

[r=hazmat][f=781949] Make it so EC2 provider can check SSL cert validity

519. By Jim Baker on 2012-04-10

merge must-specify-relation-name [r=hazmat][f=974650]

Fix relation-ids hook command such that it defaults to $JUJU_RELATION.
If that's not available, the command raises an error.

518. By Kapil Thangavelu on 2012-04-09

[trivial] fix for private clouds using ec2 api, ec2-zone and instance-type are still valid constraints

517. By Kapil Thangavelu on 2012-04-06

[trivial] log juju-origin when bootstrapping

516. By Kapil Thangavelu on 2012-04-06

[trivial] test suite should run without requiring any ec2 env vars, also fix a status test failure [r=clint-fewbar]

515. By Benjamin Saller on 2012-04-06

merge subordinate control changes [r=hazmat] [f=958378 ]

This includes support in deploy, add/remove-unit and status

514. By Jim Baker on 2012-04-05

merge relation-id-option [r=hazmat][f=965845]

Adds -r option to specify the relation id for these relation hook
commands: relation-get, relation-set, and relation-list.