Merge lp:~gandelman-a/ubuntu/saucy/quantum/fixtures_vers into lp:~openstack-ubuntu-testing/neutron/havana

Proposed by Adam Gandelman
Status: Merged
Approved by: Chuck Short
Approved revision: 157
Merged at revision: 157
Proposed branch: lp:~gandelman-a/ubuntu/saucy/quantum/fixtures_vers
Merge into: lp:~openstack-ubuntu-testing/neutron/havana
Diff against target: 29 lines (+6/-4)
2 files modified
debian/changelog (+5/-3)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/saucy/quantum/fixtures_vers
Reviewer Review Type Date Requested Status
Openstack Ubuntu Testers Pending
Review via email: mp+167371@code.launchpad.net
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-05-31 19:00:26 +0000
3+++ debian/changelog 2013-06-04 19:05:30 +0000
4@@ -1,7 +1,9 @@
5-quantum (1:2013.2~b1-0ubuntu1) saucy; urgency=low
6+quantum (1:2013.2~b1-0ubuntu1) UNRELEASED; urgency=low
7
8- * debian/control: Add version requirement to python-stevedore
9- (>= 0.8), also add to python-quantum depends.
10+ * debian/control:
11+ - Add version requirement to python-stevedore (>= 0.8), also add to
12+ python-quantum depends.
13+ - Add version requirement to python-fixtures (>= 0.3.12).
14 * debian/patches/*: Refreshed.
15
16 -- Adam Gandelman <adamg@ubuntu.com> Wed, 29 May 2013 11:54:06 -0700
17
18=== modified file 'debian/control'
19--- debian/control 2013-05-31 18:55:31 +0000
20+++ debian/control 2013-06-04 19:05:30 +0000
21@@ -14,7 +14,7 @@
22 python-coverage,
23 python-d2to1,
24 python-eventlet,
25- python-fixtures,
26+ python-fixtures (>= 0.3.12),
27 python-httplib2,
28 python-iso8601,
29 python-keystone,

Subscribers

People subscribed via source and target branches