neutron

Merge lp:~zulcss/neutron/quantum-pbr into lp:~openstack-ubuntu-testing/neutron/havana

  1. quantum-pbr
  2. Merge into havana
Proposed by Chuck Short
Status: Merged
Approved by: Yolanda Robla
Approved revision: 152
Merged at revision: 152
Proposed branch: lp:~zulcss/neutron/quantum-pbr
Merge into: lp:~openstack-ubuntu-testing/neutron/havana
Diff against target: 35 lines (+4/-1)
2 files modified
debian/changelog (+2/-1)
debian/control (+2/-0)
To merge this branch: bzr merge lp:~zulcss/neutron/quantum-pbr
Reviewer Review Type Date Requested Status
Yolanda Robla (community) Approve
Review via email: mp+164942@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Yolanda Robla (yolanda.robla) wrote :

Looks good to me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-04-30 15:34:57 +0000
+++ debian/changelog 2013-05-21 16:28:27 +0000
@@ -1,9 +1,10 @@
1quantum (1:2013.2.a442.g58d13eb-0ubuntu1) UNRELEASED; urgency=low1quantum (1:2013.2.a606.g058d156-0ubuntu1) UNRELEASED; urgency=low
22
3 * New upstream release.3 * New upstream release.
4 * debian/patches/fix-quantum-configuration.patch: Refreshed4 * debian/patches/fix-quantum-configuration.patch: Refreshed
5 * debian/control: Add testrepository.5 * debian/control: Add testrepository.
6 * debian/control: Add subunit.6 * debian/control: Add subunit.
7 * debian/control: Add python-d21o1 and python-pbr as build-depends.
78
8 -- Chuck Short <zulcss@ubuntu.com> Tue, 30 Apr 2013 10:01:18 -05009 -- Chuck Short <zulcss@ubuntu.com> Tue, 30 Apr 2013 10:01:18 -0500
910
1011
=== modified file 'debian/control'
--- debian/control 2013-04-30 15:34:57 +0000
+++ debian/control 2013-05-21 16:28:27 +0000
@@ -12,6 +12,7 @@
12 python-cliff,12 python-cliff,
13 python-configobj,13 python-configobj,
14 python-coverage,14 python-coverage,
15 python-d2to1,
15 python-eventlet,16 python-eventlet,
16 python-fixtures,17 python-fixtures,
17 python-httplib2,18 python-httplib2,
@@ -26,6 +27,7 @@
26 python-nose,27 python-nose,
27 python-novaclient,28 python-novaclient,
28 python-oslo.config,29 python-oslo.config,
30 python-pbr,
29 python-paste,31 python-paste,
30 python-pastedeploy,32 python-pastedeploy,
31 python-pyudev,33 python-pyudev,

Subscribers

People subscribed via source and target branches