Merge lp://qastaging/~celebdor/charms/trusty/midonet-api/ha_fix into lp://qastaging/~celebdor/charms/trusty/midonet-api/trunk
Proposed by
Antoni Segura Puimedon
| Status: | Merged |
|---|---|
| Merged at revision: | 17 |
| Proposed branch: | lp://qastaging/~celebdor/charms/trusty/midonet-api/ha_fix |
| Merge into: | lp://qastaging/~celebdor/charms/trusty/midonet-api/trunk |
| Diff against target: |
566 lines (+348/-25) 13 files modified
config.yaml (+30/-4) hooks/ha-relation-broken (+20/-0) hooks/ha-relation-changed (+21/-0) hooks/ha-relation-joined (+29/-0) hooks/keystone-relation-joined (+3/-5) hooks/manager-relation-broken (+21/-0) hooks/manager-relation-changed (+21/-0) hooks/manager-relation-joined (+21/-0) hooks/relations.py (+91/-2) hooks/services.py (+29/-13) hooks/utils.py (+56/-0) metadata.yaml (+5/-0) templates/common.yaml (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~celebdor/charms/trusty/midonet-api/ha_fix |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Antoni Segura Puimedon | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
