Merge lp://staging/~zulcss/nova/nova-api-fix into lp://staging/~ubuntu-server-dev/nova/icehouse
Proposed by
Chuck Short
| Status: | Rejected |
|---|---|
| Rejected by: | James Page |
| Proposed branch: | lp://staging/~zulcss/nova/nova-api-fix |
| Merge into: | lp://staging/~ubuntu-server-dev/nova/icehouse |
| Diff against target: |
137 lines (+111/-0) (has conflicts) 3 files modified
debian/changelog (+10/-0) debian/patches/fix-nova-api-fake-network.patch (+100/-0) debian/patches/series (+1/-0) Text conflict in debian/changelog |
| To merge this branch: | bzr merge lp://staging/~zulcss/nova/nova-api-fix |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Server Developers | Pending | ||
|
Review via email:
|
|||
Description of the change
Nova api fix
To post a comment you must log in.
Unmerged revisions
- 650. By Chuck Short
-
debian/
patches/ fix-nova- api-fake- network. patch: Fix nova-api
failures to start due to fake_network option missing. (LP: #1270845)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
