Merge lp:~zulcss/cinder/cinder-fixtures-deps into lp:~openstack-ubuntu-testing/cinder/havana

Proposed by Chuck Short on 2013-05-27
Status: Merged
Approved by: Yolanda Robla on 2013-05-27
Approved revision: 102
Merged at revision: 102
Proposed branch: lp:~zulcss/cinder/cinder-fixtures-deps
Merge into: lp:~openstack-ubuntu-testing/cinder/havana
Diff against target: 36 lines (+4/-1)
2 files modified
debian/changelog (+2/-1)
debian/control (+2/-0)
To merge this branch: bzr merge lp:~zulcss/cinder/cinder-fixtures-deps
Reviewer Review Type Date Requested Status
Yolanda Robla 2013-05-27 Approve on 2013-05-27
Review via email: mp+165916@code.launchpad.net
To post a comment you must log in.
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
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-05-17 17:05:27 +0000
3+++ debian/changelog 2013-05-27 16:56:23 +0000
4@@ -1,10 +1,11 @@
5-cinder (1:2013.2.a226.g1d6de0f-0ubuntu1) UNRELEASED; urgency=low
6+cinder (1:2013.2.a278.g05ce36a-0ubuntu1) UNRELEASED; urgency=low
7
8 [ Chuck Short ]
9 * New upstream version.
10 * debian/patches/fix_cinder_dependencies.patch: Dropped.
11 * debian/control: Bump standards version to 3.9.4.
12 * debian/control: Add python-pbr and python-d2to1 to build-depends.
13+ * debian/control: Add python-testtools and python-fixtures to build-depends
14 * debian/rules: Add work around to remove wonky setup.py setup
15 * debian/cinder-common.install: Add cinder-rpc-zmq-receiver binary.
16
17
18=== modified file 'debian/control'
19--- debian/control 2013-05-17 17:05:27 +0000
20+++ debian/control 2013-05-27 16:56:23 +0000
21@@ -9,6 +9,7 @@
22 python-coverage,
23 python-d2to1,
24 python-eventlet,
25+ python-fixtures,
26 python-glanceclient,
27 python-greenlet,
28 python-hp3parclient (>= 1.0.0),
29@@ -35,6 +36,7 @@
30 python-sqlalchemy,
31 python-stevedore (>= 0.8),
32 python-suds,
33+ python-testtools,
34 python-webob
35 Standards-Version: 3.9.4
36 Homepage: http://launchpad.net/cinder

Subscribers

People subscribed via source and target branches