Merge lp://staging/~gandelman-a/charms/precise/nova-cloud-controller/avoid_restarts into lp://staging/~openstack-charmers/charms/precise/nova-cloud-controller/ha-support
Proposed by
Adam Gandelman
| Status: | Merged |
|---|---|
| Merged at revision: | 69 |
| Proposed branch: | lp://staging/~gandelman-a/charms/precise/nova-cloud-controller/avoid_restarts |
| Merge into: | lp://staging/~openstack-charmers/charms/precise/nova-cloud-controller/ha-support |
| Diff against target: |
109 lines (+21/-5) 7 files modified
hooks/lib/nova/essex (+1/-0) hooks/lib/nova/folsom (+1/-0) hooks/lib/nova/grizzly (+1/-0) hooks/lib/nova/nova-common (+2/-0) hooks/lib/openstack-common (+13/-1) hooks/nova-cloud-controller-relations (+2/-3) revision (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~gandelman-a/charms/precise/nova-cloud-controller/avoid_restarts |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenStack Charmers | Pending | ||
|
Review via email:
|
|||
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
