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

[Adam Gandelman]

[Chuck Short (zulcss)]

lgtm

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-01 10:43:31 +0000
+++ debian/changelog	2012-11-30 23:40:55 +0000
@@ -1,11 +1,12 @@
-cinder (2012.2+stable-20121101-7f34ba39-0ubuntu1) quantal-proposed; urgency=low
-
-  [ James Page ]
-  * Cinder should suggest ceph-common, not python-ceph (LP: #1065901):
-    - debian/control: cinder-volume Suggests: python-ceph -> ceph-common
-
-  [ Adam Gandelman ]
-  * Resynchronize with stable/folsom (7f34ba39):
+cinder (2012.2.1-0ubuntu1) UNRELEASED; urgency=low
+
+  * Ubuntu updates:
+    - Cinder should suggest ceph-common, not python-ceph (LP: #1065901):
+      - debian/control: cinder-volume Suggests: python-ceph -> ceph-common
+  * Resynchronize with stable/folsom (87d839a5) (LP: #1085255):
+    - [f990ff0] Remove unused python-daemon dependency
+    - [940f363] Detached and deleted RBD volumes remain associated with insance
+      (LP: #1083818)
     - [7f34ba3] After folsom upgrade, instances can no longer access existing
       volumes. (LP: #1065702)
     - [1c99b24] Jenkins jobs fail because of incompatibility between sqlalchemy-
@@ -14,7 +15,7 @@
       utils.execute (LP: #1053364)
     - [ce5e002] Set defaultbranch in .gitreview to stable/folsom
 
- -- Adam Gandelman <[e-mail]>  Thu, 01 Nov 2012 11:30:15 +0100
+ -- Adam Gandelman <[e-mail]>  Fri, 30 Nov 2012 13:04:28 -0400
 
 cinder (2012.2-0ubuntu2) quantal; urgency=low
 
@@ -156,3 +157,4 @@
   * Initial release.
 
  -- Chuck Short <[e-mail]>  Tue, 22 May 2012 09:57:46 -0400
+