lp://staging/~jimbaker/pyjuju/relation-id-option

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~jimbaker/pyjuju/relation-hook-context

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

Jim Baker: Pending requested 2012-03-27

Diff: 593 lines (+200/-48)

10 files modified

juju/agents/unit.py (+1/-0)
juju/hooks/cli.py (+2/-1)
juju/hooks/commands.py (+14/-1)
juju/hooks/executor.py (+7/-0)
juju/hooks/invoker.py (+3/-2)
juju/hooks/protocol.py (+57/-27)
juju/hooks/tests/test_cli.py (+3/-5)
juju/hooks/tests/test_communications.py (+20/-10)
juju/hooks/tests/test_invoker.py (+82/-2)
juju/state/hook.py (+11/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #965845: Adds support for -r option to specify relation id for relation hook commands.

Undecided

Fix Released

Link a bug report

Related blueprints

526. By Jim Baker on 2012-04-05

Merged upstream

525. By Jim Baker on 2012-04-05

Merged upstream

524. By Jim Baker on 2012-04-05

Merged upstream & resolved conflict due to moving relation-ids command tests to upstream

523. By Jim Baker on 2012-04-05

Code rearrangement

522. By Jim Baker on 2012-04-05

Remove usage of invoker attr in favor of using the factory to get it

521. By Jim Baker on 2012-04-05

Fix setup of local api factory used by testing

520. By Jim Baker on 2012-04-04

Merged trunk & resolved conflicts

519. By Jim Baker on 2012-03-30

Merged upstream & resolved conflict

518. By Jim Baker on 2012-03-30

Fixed log assertion

517. By Jim Baker on 2012-03-29

Merged trunk & resolved conflicts