Merge lp:~gandelman-a/ubuntu/raring/quantum/fixtures_vers into lp:~openstack-ubuntu-testing/neutron/grizzly

Proposed by Adam Gandelman on 2013-06-04
Status: Merged
Approved by: Chuck Short on 2013-06-04
Approved revision: 148
Merged at revision: 148
Proposed branch: lp:~gandelman-a/ubuntu/raring/quantum/fixtures_vers
Merge into: lp:~openstack-ubuntu-testing/neutron/grizzly
Diff against target: 26 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/raring/quantum/fixtures_vers
Reviewer Review Type Date Requested Status
Openstack Ubuntu Testers 2013-06-04 Pending
Review via email: mp+167370@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-14 16:06:38 +0000
3+++ debian/changelog 2013-06-04 19:05:29 +0000
4@@ -1,3 +1,9 @@
5+quantum (1:2013.1.2-0ubuntu1) UNRELEASED; urgency=low
6+
7+ * debian/control: Add version requirement to python-fixtures (>= 0.3.12).
8+
9+ -- Adam Gandelman <adamg@ubuntu.com> Tue, 04 Jun 2013 12:01:46 -0700
10+
11 quantum (1:2013.1.1-0ubuntu1) raring-proposed; urgency=low
12
13 * Resynchronize with stable/grizzly (0602baca) (LP: #1179626):
14
15=== modified file 'debian/control'
16--- debian/control 2013-03-15 17:30:14 +0000
17+++ debian/control 2013-06-04 19:05:29 +0000
18@@ -13,7 +13,7 @@
19 python-configobj,
20 python-coverage,
21 python-eventlet,
22- python-fixtures,
23+ python-fixtures (>= 0.3.12),
24 python-httplib2,
25 python-iso8601,
26 python-keystone,

Subscribers

People subscribed via source and target branches