Merge lp:~gandelman-a/ubuntu/quantal/quantum/ovs_cleanup into lp:~openstack-ubuntu-testing/neutron/folsom

Proposed by Adam Gandelman
Status: Merged
Approved by: Chuck Short
Approved revision: 108
Merged at revision: 108
Proposed branch: lp:~gandelman-a/ubuntu/quantal/quantum/ovs_cleanup
Merge into: lp:~openstack-ubuntu-testing/neutron/folsom
Diff against target: 24 lines (+8/-0)
2 files modified
debian/changelog (+7/-0)
debian/quantum-common.install (+1/-0)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/quantal/quantum/ovs_cleanup
Reviewer Review Type Date Requested Status
Openstack Ubuntu Testers Pending
Review via email: mp+151314@code.launchpad.net

Description of the change

the OVS cleanup utility was merged into stable/folsom. Package needs to be updated to install this along with the other cleanup utilities.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-02-07 02:34:45 +0000
3+++ debian/changelog 2013-03-01 20:10:25 +0000
4@@ -1,3 +1,10 @@
5+quantum (2012.2.3-0ubuntu2) quantal-proposed; urgency=low
6+
7+ * debian/quantum-common.install: Install the quantum-ovs-cleanup script
8+ that was backported to stable/folsom.
9+
10+ -- Adam Gandelman <adamg@ubuntu.com> Fri, 01 Mar 2013 11:12:34 -0800
11+
12 quantum (2012.2.3-0ubuntu1) quantal-proposed; urgency=low
13
14 * Resynchronize with stable/folsom (d2a85e65) (LP: #1116671):
15
16=== modified file 'debian/quantum-common.install'
17--- debian/quantum-common.install 2012-09-11 00:35:56 +0000
18+++ debian/quantum-common.install 2013-03-01 20:10:25 +0000
19@@ -4,5 +4,6 @@
20 etc/rootwrap.conf etc/quantum
21 bin/quantum-rootwrap usr/bin
22 bin/quantum-netns-cleanup usr/bin
23+bin/quantum-ovs-cleanup usr/bin
24 debian/quantum_sudoers etc/sudoers.d
25

Subscribers

People subscribed via source and target branches