Merge lp:~gandelman-a/ubuntu/quantal/cinder/2012.2.1 into lp:~openstack-ubuntu-testing/cinder/folsom

Proposed by Adam Gandelman on 2012-11-30
Status: Merged
Approved by: Chuck Short on 2012-12-03
Approved revision: 61
Merge reported by: Adam Gandelman
Merged at revision: not available
Proposed branch: lp:~gandelman-a/ubuntu/quantal/cinder/2012.2.1
Merge into: lp:~openstack-ubuntu-testing/cinder/folsom
Diff against target: 38 lines (+11/-9)
1 file modified
debian/changelog (+11/-9)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/quantal/cinder/2012.2.1
Reviewer Review Type Date Requested Status
Openstack Ubuntu Testers 2012-11-30 Pending
Review via email: mp+137349@code.launchpad.net
To post a comment you must log in.
Chuck Short (zulcss) wrote :

lgtm

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 2012-11-01 10:43:31 +0000
3+++ debian/changelog 2012-11-30 23:40:55 +0000
4@@ -1,11 +1,12 @@
5-cinder (2012.2+stable-20121101-7f34ba39-0ubuntu1) quantal-proposed; urgency=low
6-
7- [ James Page ]
8- * Cinder should suggest ceph-common, not python-ceph (LP: #1065901):
9- - debian/control: cinder-volume Suggests: python-ceph -> ceph-common
10-
11- [ Adam Gandelman ]
12- * Resynchronize with stable/folsom (7f34ba39):
13+cinder (2012.2.1-0ubuntu1) UNRELEASED; urgency=low
14+
15+ * Ubuntu updates:
16+ - Cinder should suggest ceph-common, not python-ceph (LP: #1065901):
17+ - debian/control: cinder-volume Suggests: python-ceph -> ceph-common
18+ * Resynchronize with stable/folsom (87d839a5) (LP: #1085255):
19+ - [f990ff0] Remove unused python-daemon dependency
20+ - [940f363] Detached and deleted RBD volumes remain associated with insance
21+ (LP: #1083818)
22 - [7f34ba3] After folsom upgrade, instances can no longer access existing
23 volumes. (LP: #1065702)
24 - [1c99b24] Jenkins jobs fail because of incompatibility between sqlalchemy-
25@@ -14,7 +15,7 @@
26 utils.execute (LP: #1053364)
27 - [ce5e002] Set defaultbranch in .gitreview to stable/folsom
28
29- -- Adam Gandelman <adamg@canonical.com> Thu, 01 Nov 2012 11:30:15 +0100
30+ -- Adam Gandelman <adamg@canonical.com> Fri, 30 Nov 2012 13:04:28 -0400
31
32 cinder (2012.2-0ubuntu2) quantal; urgency=low
33
34@@ -156,3 +157,4 @@
35 * Initial release.
36
37 -- Chuck Short <zulcss@ubuntu.com> Tue, 22 May 2012 09:57:46 -0400
38+

Subscribers

People subscribed via source and target branches