Merge lp://qastaging/~gnuoy/python-novaclient/juno-update-deps into lp://qastaging/~ubuntu-server-dev/python-novaclient/juno
Proposed by
Liam Young
| Status: | Merged |
|---|---|
| Approved by: | Chuck Short |
| Approved revision: | 88 |
| Merge reported by: | Chuck Short |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~gnuoy/python-novaclient/juno-update-deps |
| Merge into: | lp://qastaging/~ubuntu-server-dev/python-novaclient/juno |
| Diff against target: |
77 lines (+20/-13) 2 files modified
debian/changelog (+6/-2) debian/control (+14/-11) |
| To merge this branch: | bzr merge lp://qastaging/~gnuoy/python-novaclient/juno-update-deps |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Liam Young (community) | Needs Resubmitting | ||
| Ubuntu Server Developers | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Chuck Short (zulcss) wrote | # |
Revision history for this message
| Liam Young (gnuoy) | # |
review:
Needs Resubmitting
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Can you clean up the merge conflicts?