Merge lp://staging/~le-charmers/charms/trusty/cinder/leadership-election into lp://staging/~openstack-charmers-archive/charms/trusty/cinder/next
Proposed by
Edward Hope-Morley
| Status: | Merged |
|---|---|
| Merged at revision: | 96 |
| Proposed branch: | lp://staging/~le-charmers/charms/trusty/cinder/leadership-election |
| Merge into: | lp://staging/~openstack-charmers-archive/charms/trusty/cinder/next |
| Diff against target: |
648 lines (+251/-45) 11 files modified
hooks/charmhelpers/contrib/hahelpers/cluster.py (+37/-2) hooks/charmhelpers/contrib/openstack/neutron.py (+10/-5) hooks/charmhelpers/core/hookenv.py (+147/-10) hooks/charmhelpers/core/host.py (+1/-1) hooks/charmhelpers/core/services/base.py (+32/-11) hooks/charmhelpers/fetch/__init__.py (+1/-1) hooks/cinder_hooks.py (+3/-3) hooks/cinder_utils.py (+8/-2) unit_tests/test_cinder_hooks.py (+8/-6) unit_tests/test_cinder_utils.py (+3/-3) unit_tests/test_cluster_hooks.py (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~le-charmers/charms/trusty/cinder/leadership-election |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenStack Charmers | 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
