lp://staging/~fwereade/pyjuju/state-machine-sync

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~fwereade/pyjuju/fix-charm-upgrade at revision 456

William Reade: Approve on 2012-02-21

Kapil Thangavelu (community): Approve on 2012-02-17

Diff: 2429 lines (+795/-536)

11 files modified

juju/agents/tests/test_unit.py (+12/-7)
juju/agents/unit.py (+35/-35)
juju/control/tests/test_resolved.py (+16/-8)
juju/control/tests/test_status.py (+10/-36)
juju/control/tests/test_upgrade_charm.py (+4/-2)
juju/lib/statemachine.py (+105/-28)
juju/lib/tests/test_statemachine.py (+199/-75)
juju/unit/lifecycle.py (+18/-21)
juju/unit/tests/test_lifecycle.py (+50/-42)
juju/unit/tests/test_workflow.py (+298/-217)
juju/unit/workflow.py (+48/-65)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

457. By William Reade on 2012-02-21

address review comment

456. By William Reade on 2012-02-14

statemachine changes must now be externally locked; added synchronize method to statemachine to catch up with inflight transitions at startup

455. By William Reade on 2012-02-08

merge parent

454. By William Reade on 2012-02-02

remove UL.upgrade_charm's first_attempt kwarg

453. By William Reade on 2012-02-02

manually back out r448 without screwing up future merges, I hope

452. By William Reade on 2012-01-30

merge parent

451. By William Reade on 2012-01-23

merge parent

450. By William Reade on 2012-01-16

address final review point

449. By William Reade on 2012-01-16

address review point

448. By William Reade on 2012-01-16

added upgrade_charm_ready and charm_replaced states, along with suitable transitions and error states