Merge lp://staging/~tribaal/charms/trusty/swift-proxy/sync-charm-helpers into lp://staging/~openstack-charmers-archive/charms/trusty/swift-proxy/trunk
Proposed by
Chris Glass
| Status: | Merged |
|---|---|
| Merged at revision: | 51 |
| Proposed branch: | lp://staging/~tribaal/charms/trusty/swift-proxy/sync-charm-helpers |
| Merge into: | lp://staging/~openstack-charmers-archive/charms/trusty/swift-proxy/trunk |
| Diff against target: |
541 lines (+263/-74) 8 files modified
hooks/charmhelpers/contrib/openstack/context.py (+1/-1) hooks/charmhelpers/contrib/openstack/neutron.py (+17/-1) hooks/charmhelpers/contrib/openstack/utils.py (+8/-1) hooks/charmhelpers/contrib/storage/linux/lvm.py (+1/-1) hooks/charmhelpers/contrib/storage/linux/utils.py (+28/-5) hooks/charmhelpers/core/hookenv.py (+98/-1) hooks/charmhelpers/core/host.py (+14/-0) hooks/charmhelpers/fetch/__init__.py (+96/-64) |
| To merge this branch: | bzr merge lp://staging/~tribaal/charms/trusty/swift-proxy/sync-charm-helpers |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenStack Charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
This branch syncs back the changes from charm-helpers as of http://
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
