lp:~bcsaller/pyjuju/subordinate-unit-agent-deploy

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:pyjuju at revision 525

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

Diff: 6987 lines (+3444/-2964)

27 files modified

examples/precise/recorder/hooks/juju-info-relation-changed (+5/-0)
examples/precise/recorder/hooks/juju-info-relation-departed (+3/-0)
examples/precise/recorder/hooks/juju-info-relation-joined (+6/-0)
examples/precise/recorder/metadata.yaml (+9/-0)
examples/precise/recorder/revision (+1/-0)
juju/agents/tests/test_machine.py (+2/-2)
juju/control/destroy_service.py (+29/-0)
juju/control/remove_relation.py (+24/-1)
juju/control/remove_unit.py (+6/-3)
juju/control/tests/test_destroy_service.py (+94/-0)
juju/control/tests/test_remove_relation.py (+21/-1)
juju/control/tests/test_remove_unit.py (+16/-2)
juju/environment/config.py (+4/-3)
juju/lib/lxc/__init__.py (+8/-4)
juju/lib/lxc/tests/test_lxc.py (+12/-6)
juju/machine/unit.py (+22/-0)
juju/state/errors.py (+29/-5)
juju/state/hook.py (+1/-0)
juju/state/relation.py (+14/-5)
juju/state/tests/test_errors.py (+29/-4)
juju/state/tests/test_hook.py (+61/-14)
juju/state/tests/test_relation.py (+5/-5)
juju/state/tests/test_service.py (+2868/-2890)
juju/unit/charm.py (+1/-0)
juju/unit/deploy.py (+13/-12)
juju/unit/lifecycle.py (+53/-2)
juju/unit/tests/test_lifecycle.py (+108/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #805585: Policy charms should be able to be deployed along side other charms inside the same machine/container.	High	Fix Released
Bug #963355: Agent lifecycle suport for subordinates	Undecided	In Progress

Link a bug report

Related blueprints

566. By Benjamin Saller on 2012-04-12

improve remove relation principal detection

565. By Benjamin Saller on 2012-04-11

Merged state-removal into subordinate-unit-agent-deploy.

564. By Benjamin Saller on 2012-04-11

typo

563. By Benjamin Saller on 2012-04-11

reindent test_service, add test for illegalsubordinatemachineassignment

562. By Benjamin Saller on 2012-04-11

fix exception name typo throughout

561. By Benjamin Saller on 2012-04-11

forward merge

560. By Benjamin Saller on 2012-04-10

review changes

559. By Benjamin Saller on 2012-04-10

forward merge

558. By Benjamin Saller on 2012-04-10

forward merge

557. By Benjamin Saller on 2012-04-10

removing undeploy spike, postpone