Merge lp://staging/~gnuoy/charms/trusty/cinder-ceph/next-charm-sync into lp://staging/~openstack-charmers-archive/charms/trusty/cinder-ceph/next
Proposed by
Liam Young
| Status: | Merged |
|---|---|
| Merged at revision: | 17 |
| Proposed branch: | lp://staging/~gnuoy/charms/trusty/cinder-ceph/next-charm-sync |
| Merge into: | lp://staging/~openstack-charmers-archive/charms/trusty/cinder-ceph/next |
| Diff against target: |
1100 lines (+735/-52) 14 files modified
hooks/charmhelpers/contrib/hahelpers/cluster.py (+55/-13) hooks/charmhelpers/contrib/network/ip.py (+19/-1) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+13/-7) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+86/-20) hooks/charmhelpers/contrib/openstack/context.py (+31/-4) hooks/charmhelpers/contrib/openstack/ip.py (+7/-3) hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+3/-3) hooks/charmhelpers/contrib/storage/linux/utils.py (+3/-0) hooks/charmhelpers/core/host.py (+34/-1) hooks/charmhelpers/core/services/__init__.py (+2/-0) hooks/charmhelpers/core/services/base.py (+305/-0) hooks/charmhelpers/core/services/helpers.py (+125/-0) hooks/charmhelpers/core/templating.py (+51/-0) hooks/charmhelpers/fetch/__init__.py (+1/-0) |
| To merge this branch: | bzr merge lp://staging/~gnuoy/charms/trusty/cinder-ceph/next-charm-sync |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Liam Young (community) | Approve | ||
|
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
Approved by jamespage