Merge lp://qastaging/~hopem/charms/precise/nova-compute/lp1273067 into lp://qastaging/~openstack-charmers-archive/charms/precise/nova-compute/trunk
Proposed by
Edward Hope-Morley
| Status: | Merged |
|---|---|
| Merged at revision: | 56 |
| Proposed branch: | lp://qastaging/~hopem/charms/precise/nova-compute/lp1273067 |
| Merge into: | lp://qastaging/~openstack-charmers-archive/charms/precise/nova-compute/trunk |
| Diff against target: |
466 lines (+151/-42) 11 files modified
hooks/charmhelpers/contrib/hahelpers/cluster.py (+4/-4) hooks/charmhelpers/contrib/openstack/context.py (+37/-11) hooks/charmhelpers/contrib/openstack/neutron.py (+28/-4) hooks/charmhelpers/contrib/openstack/templates/ceph.conf (+5/-1) hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+2/-3) hooks/charmhelpers/contrib/openstack/utils.py (+16/-13) hooks/charmhelpers/contrib/storage/linux/ceph.py (+6/-2) hooks/charmhelpers/contrib/storage/linux/utils.py (+2/-1) hooks/charmhelpers/core/host.py (+9/-3) hooks/charmhelpers/fetch/__init__.py (+27/-0) hooks/charmhelpers/fetch/archiveurl.py (+15/-0) |
| To merge this branch: | bzr merge lp://qastaging/~hopem/charms/precise/nova-compute/lp1273067 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Page | Approve | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| James Page (james-page) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
