Merge lp:~gnuoy/heat/juno-update-deps into lp:~ubuntu-server-dev/heat/juno
Proposed by
Liam Young
Status: | Needs review |
---|---|
Proposed branch: | lp:~gnuoy/heat/juno-update-deps |
Merge into: | lp:~ubuntu-server-dev/heat/juno |
Diff against target: |
191 lines (+68/-42) (has conflicts) 4 files modified
debian/changelog (+9/-0) debian/control (+56/-39) debian/heat-common.install (+2/-2) debian/heat-engine.install (+1/-1) Text conflict in debian/changelog Text conflict in debian/control |
To merge this branch: | bzr merge lp:~gnuoy/heat/juno-update-deps |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chuck Short (community) | Needs Fixing | ||
Review via email: mp+225671@code.launchpad.net |
To post a comment you must log in.
Unmerged revisions
- 61. By Liam Young
-
Added runtime dependancies from requirements.txt
Looks like you have a merge conflict in the debian/changelog.