Merge lp://qastaging/~gnuoy/charms/trusty/keystone/next-charm-sync into lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next
Proposed by
Liam Young
Status: | Merged |
---|---|
Merged at revision: | 74 |
Proposed branch: | lp://qastaging/~gnuoy/charms/trusty/keystone/next-charm-sync |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next |
Diff against target: |
872 lines (+627/-32) 13 files modified
hooks/charmhelpers/contrib/hahelpers/cluster.py (+46/-13) hooks/charmhelpers/contrib/network/ip.py (+19/-1) hooks/charmhelpers/contrib/openstack/context.py (+20/-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) unit_tests/test_keystone_contexts.py (+11/-7) |
To merge this branch: | bzr merge lp://qastaging/~gnuoy/charms/trusty/keystone/next-charm-sync |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Review via email: mp+230632@code.qastaging.launchpad.net |
To post a comment you must log in.
Approved by jamespage