Merge lp:~gandelman-a/ubuntu/raring/cinder/1169730 into lp:~openstack-ubuntu-testing/cinder/grizzly

Proposed by Adam Gandelman
Status: Merged
Merged at revision: 95
Proposed branch: lp:~gandelman-a/ubuntu/raring/cinder/1169730
Merge into: lp:~openstack-ubuntu-testing/cinder/grizzly
Diff against target: 35 lines (+9/-1)
2 files modified
debian/changelog (+7/-0)
debian/control (+2/-1)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/raring/cinder/1169730
Reviewer Review Type Date Requested Status
James Page Needs Fixing
Review via email: mp+159243@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Page (james-page) wrote :

Adam

Please just depend on the upstream version, not including the packaging revision.

Cheers

James

review: Needs Fixing
95. By Adam Gandelman

Fix version.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-03-27 12:51:23 +0000
+++ debian/changelog 2013-04-16 21:31:25 +0000
@@ -1,3 +1,10 @@
1cinder (1:2013.1~rc3-0ubuntu2) UNRELEASED; urgency=low
2
3 * debian/control: Bump minimum stevedore version 0.8-2.
4 (LP: #1169730)
5
6 -- Adam Gandelman <adamg@ubuntu.com> Tue, 16 Apr 2013 14:18:41 -0700
7
1cinder (1:2013.1~rc3-0ubuntu1) raring; urgency=low8cinder (1:2013.1~rc3-0ubuntu1) raring; urgency=low
29
3 * New upstream release. 10 * New upstream release.
411
=== modified file 'debian/control'
--- debian/control 2013-03-22 12:40:00 +0000
+++ debian/control 2013-04-16 21:31:25 +0000
@@ -33,7 +33,7 @@
33 python-setuptools-git,33 python-setuptools-git,
34 python-sphinx,34 python-sphinx,
35 python-sqlalchemy,35 python-sqlalchemy,
36 python-stevedore (>= 0.7),36 python-stevedore (>= 0.8),
37 python-suds,37 python-suds,
38 python-webob38 python-webob
39Standards-Version: 3.9.339Standards-Version: 3.9.3
@@ -60,6 +60,7 @@
60 python-paste,60 python-paste,
61 python-pastedeploy,61 python-pastedeploy,
62 python-routes,62 python-routes,
63 python-stevedore (>= 0.8),
63 python-swiftclient,64 python-swiftclient,
64 python-sqlalchemy,65 python-sqlalchemy,
65 python-suds,66 python-suds,

Subscribers

People subscribed via source and target branches