Merge lp:~zulcss/cinder/cinder-rtslib-remove into lp:~openstack-ubuntu-testing/cinder/grizzly

Proposed by Chuck Short on 2013-03-22
Status: Merged
Approved by: Yolanda Robla on 2013-03-22
Approved revision: 89
Merged at revision: 89
Proposed branch: lp:~zulcss/cinder/cinder-rtslib-remove
Merge into: lp:~openstack-ubuntu-testing/cinder/grizzly
Diff against target: 37 lines (+7/-2)
3 files modified
debian/changelog (+7/-0)
debian/cinder-volume.install (+0/-1)
debian/control (+0/-1)
To merge this branch: bzr merge lp:~zulcss/cinder/cinder-rtslib-remove
Reviewer Review Type Date Requested Status
Yolanda Robla 2013-03-22 Approve on 2013-03-22
Review via email: mp+154937@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-03-17 08:13:01 +0000
3+++ debian/changelog 2013-03-22 12:43:21 +0000
4@@ -1,3 +1,10 @@
5+cinder (1:2013.1~rc1-0ubuntu2) UNRELEASED; urgency=low
6+
7+ * debian/control, debian/cinder-volume.install: Dropped rtstool and python-rtslib
8+ since it was dropped upstream.
9+
10+ -- Chuck Short <zulcss@ubuntu.com> Fri, 22 Mar 2013 07:37:53 -0500
11+
12 cinder (1:2013.1~rc1-0ubuntu1) raring; urgency=low
13
14 [ Chuck Short ]
15
16=== modified file 'debian/cinder-volume.install'
17--- debian/cinder-volume.install 2013-02-20 10:31:01 +0000
18+++ debian/cinder-volume.install 2013-03-22 12:43:21 +0000
19@@ -1,6 +1,5 @@
20 debian/cinder_tgt.conf etc/tgt/conf.d
21 etc/cinder/rootwrap.d/volume.filters /etc/cinder/rootwrap.d
22 usr/bin/cinder-clear-rabbit-queues
23-usr/bin/cinder-rtstool
24 usr/bin/cinder-volume
25 usr/bin/cinder-volume-usage-audit
26
27=== modified file 'debian/control'
28--- debian/control 2013-03-07 18:54:05 +0000
29+++ debian/control 2013-03-22 12:43:21 +0000
30@@ -60,7 +60,6 @@
31 python-paste,
32 python-pastedeploy,
33 python-routes,
34- python-rtslib,
35 python-swiftclient,
36 python-sqlalchemy,
37 python-suds,

Subscribers

People subscribed via source and target branches