Merge lp://staging/~openstack-charmers/charms/precise/nova-cloud-controller/active-active into lp://staging/~openstack-charmers-archive/charms/precise/nova-cloud-controller/trunk
Proposed by
Edward Hope-Morley
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~openstack-charmers/charms/precise/nova-cloud-controller/active-active |
| Merge into: | lp://staging/~openstack-charmers-archive/charms/precise/nova-cloud-controller/trunk |
| Diff against target: |
505 lines (+287/-35) 7 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/nova_cc_hooks.py (+1/-0) templates/grizzly/nova.conf (+130/-0) templates/grizzly/quantum.conf (+55/-0) templates/havana/neutron.conf (+10/-2) |
| To merge this branch: | bzr merge lp://staging/~openstack-charmers/charms/precise/nova-cloud-controller/active-active |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenStack Charmers | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Unmerged revisions
- 70. By Edward Hope-Morley
-
[hopem] set charm-helpers.yaml to point to trunk and synced charm-helpers
- 69. By Edward Hope-Morley
-
[hopem] synced charm-helpers
- 68. By Edward Hope-Morley
-
[hopem] updated from trunk
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
