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

Proposed by Adam Gandelman
Status: Merged
Approved by: Chuck Short
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 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
=== modified file 'debian/changelog'
--- debian/changelog 2013-05-14 16:06:38 +0000
+++ debian/changelog 2013-06-04 19:05:29 +0000
@@ -1,3 +1,9 @@
1quantum (1:2013.1.2-0ubuntu1) UNRELEASED; urgency=low
2
3 * debian/control: Add version requirement to python-fixtures (>= 0.3.12).
4
5 -- Adam Gandelman <adamg@ubuntu.com> Tue, 04 Jun 2013 12:01:46 -0700
6
1quantum (1:2013.1.1-0ubuntu1) raring-proposed; urgency=low7quantum (1:2013.1.1-0ubuntu1) raring-proposed; urgency=low
28
3 * Resynchronize with stable/grizzly (0602baca) (LP: #1179626):9 * Resynchronize with stable/grizzly (0602baca) (LP: #1179626):
410
=== modified file 'debian/control'
--- debian/control 2013-03-15 17:30:14 +0000
+++ debian/control 2013-06-04 19:05:29 +0000
@@ -13,7 +13,7 @@
13 python-configobj,13 python-configobj,
14 python-coverage,14 python-coverage,
15 python-eventlet,15 python-eventlet,
16 python-fixtures,16 python-fixtures (>= 0.3.12),
17 python-httplib2,17 python-httplib2,
18 python-iso8601,18 python-iso8601,
19 python-keystone,19 python-keystone,

Subscribers

People subscribed via source and target branches