Merge lp://staging/~james-page/charms/precise/nova-compute/fix-nm-config-store into lp://staging/~charmers/charms/precise/nova-compute/trunk
Proposed by
James Page
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~james-page/charms/precise/nova-compute/fix-nm-config-store |
| Merge into: | lp://staging/~charmers/charms/precise/nova-compute/trunk |
| Diff against target: |
1204 lines (+890/-46) (has conflicts) 10 files modified
config.yaml (+14/-0) 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/lib/openstack-common (+587/-25) hooks/nova-compute-common (+107/-9) hooks/nova-compute-relations (+59/-1) metadata.yaml (+3/-0) revision (+4/-0) Text conflict in config.yaml Text conflict in hooks/nova-compute-common Text conflict in hooks/nova-compute-relations Text conflict in revision |
| To merge this branch: | bzr merge lp://staging/~james-page/charms/precise/nova-compute/fix-nm-config-store |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| charmers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2013-03-11.
Description of the change
Fixup configure_
This was causing issues in other hooks when the value was stored but the associated packages had not been installed.
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
