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

[Adam Gandelman]

NOTE:

    - [db0595a] [SRU] There is now a dependency on paramiko v1.8.0
      (LP: #1150720)

We still need to take care of making sure the quantal and precise versions of paramiko have been properly SRU'd to support this change, and add a patch that removes the version dependency from pip-requires.

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-23 00:36:31 +0000
+++ debian/changelog	2013-04-26 01:07:39 +0000
@@ -1,3 +1,30 @@
+cinder (2012.2.4-0ubuntu1) UNRELEASED; urgency=low
+
+  * Dropped patches, applied upstream:
+    - debian/patches/CVE-2013-1664.patch: [fcf249d]
+  * Resynchronize with stable/folsom (7916a2f4):
+    - [ec46ee0] NetApp: Folsom driver wrongly allows creation of volumes of
+      different size from snapshots LP: 1164473
+    - [00e8049] Cannot delete snapshot in "error" state LP: 1143661
+    - [ce516f6] fanout_cast_to_server in kombu calls wrong method LP: 1074113
+    - [cdb72ee] Enable direct testing with nosetests
+    - [e63fa95] Netapp: delete_volume leaves qtree behind LP: 1099414
+    - [8e702a1] NetApp: Can't delete a volume in error state LP: 1090167
+    - [2e7f717] Don't have permission to delete a volume in error state
+      LP: 1084273
+    - [ad2dddd] Volume can't be deleted if tgt has had a reconnect. LP: 1159948
+    - [db0595a] [SRU] There is now a dependency on paramiko v1.8.0
+      (LP: #1150720)
+    - [a616001] Only use iscsi_helper config option if using ISCSIDriver
+    - [cbad3e3] Can not create volume snapshot when using NfsDriver LP: 1097266
+    - [95c9f6f] Volume type extra specs update with empty body returns HTTP
+      status 422 LP: 1090320
+    - [aeece14] ISCSITargetRemoveFailed: Failed to remove iscsi target
+      LP: 1101071
+    - [fcf249d] DoS through XML entity expansion (CVE-2013-1664) LP: 1100282
+
+ -- Adam Gandelman <[e-mail]>  Thu, 25 Apr 2013 17:29:58 -0400
+
 cinder (2012.2.3-0ubuntu2) quantal-proposed; urgency=low
 
   * Re-sync with latest security updates.