Merge lp://qastaging/~1chb1n/charms/trusty/rabbitmq-server/next-ch-sync-mitaka-uca into lp://qastaging/~openstack-charmers-archive/charms/trusty/rabbitmq-server/next
Proposed by
Ryan Beisner
| Status: | Merged |
|---|---|
| Merged at revision: | 127 |
| Proposed branch: | lp://qastaging/~1chb1n/charms/trusty/rabbitmq-server/next-ch-sync-mitaka-uca |
| Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/rabbitmq-server/next |
| Diff against target: |
2209 lines (+990/-261) 22 files modified
hooks/charmhelpers/cli/__init__.py (+3/-3) hooks/charmhelpers/contrib/charmsupport/nrpe.py (+52/-14) hooks/charmhelpers/contrib/network/ip.py (+21/-19) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+75/-11) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+25/-3) hooks/charmhelpers/contrib/openstack/context.py (+32/-2) hooks/charmhelpers/contrib/openstack/files/check_haproxy.sh (+7/-5) hooks/charmhelpers/contrib/openstack/neutron.py (+2/-2) hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+19/-11) hooks/charmhelpers/contrib/openstack/utils.py (+59/-26) hooks/charmhelpers/contrib/python/packages.py (+13/-4) hooks/charmhelpers/contrib/storage/linux/ceph.py (+441/-59) hooks/charmhelpers/contrib/storage/linux/loopback.py (+10/-0) hooks/charmhelpers/core/hookenv.py (+54/-6) hooks/charmhelpers/core/host.py (+82/-21) hooks/charmhelpers/core/services/helpers.py (+14/-5) hooks/charmhelpers/core/templating.py (+21/-8) hooks/charmhelpers/fetch/__init__.py (+10/-2) hooks/charmhelpers/fetch/archiveurl.py (+1/-1) hooks/charmhelpers/fetch/bzrurl.py (+22/-32) hooks/charmhelpers/fetch/giturl.py (+19/-24) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+8/-3) |
| To merge this branch: | bzr merge lp://qastaging/~1chb1n/charms/trusty/rabbitmq-server/next-ch-sync-mitaka-uca |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenStack Charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
Sync charm-helpers for Mitaka cloud archive capability.
To post a comment you must log in.
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote | # |
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote | # |
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
charm_lint_check #17088 rabbitmq-
LINT OK: passed
Build: http://