Merge lp:~openstack-charmers/charms/precise/cinder/active-active into lp:~openstack-charmers-archive/charms/precise/cinder/trunk
Proposed by
Edward Hope-Morley
Status: | Work in progress |
---|---|
Proposed branch: | lp:~openstack-charmers/charms/precise/cinder/active-active |
Merge into: | lp:~openstack-charmers-archive/charms/precise/cinder/trunk |
Diff against target: |
356 lines (+159/-33) 5 files modified
hooks/charmhelpers/contrib/hahelpers/apache.py (+9/-8) hooks/charmhelpers/contrib/openstack/context.py (+68/-21) hooks/charmhelpers/contrib/openstack/neutron.py (+14/-4) hooks/cinder_hooks.py (+8/-0) templates/grizzly/cinder.conf (+60/-0) |
To merge this branch: | bzr merge lp:~openstack-charmers/charms/precise/cinder/active-active |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenStack Charmers | Pending | ||
Review via email: mp+213043@code.launchpad.net |
To post a comment you must log in.
Unmerged revisions
- 48. By Edward Hope-Morley
-
[hopem] set charm-helpers.yaml to point to trunk and synced charm-helpers
- 47. By Edward Hope-Morley
-
[hopem] synced charm-helpers
- 46. By Edward Hope-Morley
-
[hopem] updated from trunk