Merge lp://qastaging/~gandelman-a/charms/precise/nova-compute/openstack-charmers-merge-migration into lp://qastaging/~openstack-charmers/charms/precise/nova-compute/ha-support
Proposed by
Adam Gandelman
| Status: | Merged |
|---|---|
| Merged at revision: | 43 |
| Proposed branch: | lp://qastaging/~gandelman-a/charms/precise/nova-compute/openstack-charmers-merge-migration |
| Merge into: | lp://qastaging/~openstack-charmers/charms/precise/nova-compute/ha-support |
| Diff against target: |
414 lines (+251/-16) 9 files modified
config.yaml (+11/-1) hooks/lib/nova/essex (+2/-2) hooks/lib/nova/folsom (+3/-5) hooks/lib/nova/grizzly (+80/-0) hooks/lib/nova/nova-common (+31/-4) hooks/nova-compute-common (+87/-2) hooks/nova-compute-relations (+33/-1) metadata.yaml (+3/-0) revision (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~gandelman-a/charms/precise/nova-compute/openstack-charmers-merge-migration |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenStack Charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
Rebased in-progress live migration work against the other HA stuff we've been doing off of lp:~openstack-charmers branches. Original merge proposal @ https:/
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
