Merge lp:~gandelman-a/ubuntu/raring/quantum/fix_bin_conflicts into lp:~openstack-ubuntu-testing/neutron/grizzly
Proposed by
Adam Gandelman
Status: | Merged |
---|---|
Merged at revision: | 131 |
Proposed branch: | lp:~gandelman-a/ubuntu/raring/quantum/fix_bin_conflicts |
Merge into: | lp:~openstack-ubuntu-testing/neutron/grizzly |
Diff against target: |
72 lines (+16/-9) 4 files modified
debian/changelog (+8/-0) debian/control (+8/-4) debian/quantum-plugin-nec.install (+0/-2) debian/quantum-server.install (+0/-3) |
To merge this branch: | bzr merge lp:~gandelman-a/ubuntu/raring/quantum/fix_bin_conflicts |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Page | Approve | ||
Review via email: mp+149428@code.launchpad.net |
Description of the change
Hopefully fixes a number of binary conflicts, one of which affects the package currently in Raring.
To post a comment you must log in.
Good spots.