Merge lp:~james-page/cinder/python-ceph-switch into lp:~ubuntu-server-dev/cinder/havana

Proposed by James Page
Status: Merged
Approved by: Chuck Short
Approved revision: 123
Merged at revision: 123
Proposed branch: lp:~james-page/cinder/python-ceph-switch
Merge into: lp:~ubuntu-server-dev/cinder/havana
Diff against target: 36 lines (+9/-2)
2 files modified
debian/changelog (+8/-0)
debian/control (+1/-2)
To merge this branch: bzr merge lp:~james-page/cinder/python-ceph-switch
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+176353@code.launchpad.net

Description of the change

Fixup suggests for RBD integration.

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-07-22 14:03:56 +0000
3+++ debian/changelog 2013-07-23 11:01:32 +0000
4@@ -1,3 +1,11 @@
5+cinder (1:2013.2~b2-0ubuntu4) UNRELEASED; urgency=low
6+
7+ * d/control: Switch ceph-common -> python-ceph inline with upstream
8+ refactoring of Ceph RBD driver, move to Suggests of python-cinder.
9+ (LP: #1190791).
10+
11+ -- James Page <james.page@ubuntu.com> Tue, 23 Jul 2013 11:55:49 +0100
12+
13 cinder (1:2013.2~b2-0ubuntu3) saucy; urgency=low
14
15 * debian/patches/fix-sqlalchemy-requirements.patch: Fix requirements for sqlalchemy
16
17=== modified file 'debian/control'
18--- debian/control 2013-07-17 18:31:23 +0000
19+++ debian/control 2013-07-23 11:01:32 +0000
20@@ -72,7 +72,7 @@
21 python-webob,
22 ${misc:Depends},
23 ${python:Depends}
24-Suggests: python-hp3parclient
25+Suggests: python-hp3parclient, python-ceph
26 Description: Cinder Python libraries
27 OpenStack is a reliable cloud infrastructure. Its mission is to produce
28 the ubiquitous cloud computing platform that will meet the needs of public
29@@ -122,7 +122,6 @@
30 tgt,
31 ${misc:Depends},
32 ${python:Depends}
33-Suggests: ceph-common
34 Breaks: cinder-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
35 Replaces: cinder-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
36 Description: Cinder storage service - Volume server

Subscribers

People subscribed via source and target branches