Merge lp:~corey.bryant/cinder/2014.1.3 into lp:~ubuntu-server-dev/cinder/icehouse

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-12 15:01:44 +0000
+++ debian/changelog	2014-10-03 15:07:43 +0000
@@ -1,3 +1,28 @@
+cinder (1:2014.1.3-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/icehouse (360705a) (LP: #1377136):
+    - [7eef596] Refuse invalid qcow2 backing files
+    - [8f7823d] Fixes terminate_connection live migration issue
+    - [db5a25d] NetApp NFS: Do not reference dst_img_local before assignment
+    - [ec249ee] Sync latest process and str utils from oslo
+    - [d3b1102] Fix KeyError exception in NetApp CDOT iscsi driver volume create.
+    - [1604b49] Don't clear _mounted_shares list in remoteFS while updating
+    - [da5c3e6] Update cinder.conf.sample
+    - [8178590] Block sqlalchemy-migrate 0.9.2
+    - [5863f52] Mock glance client object in version unit tests
+    - [03573a0] VMware: Disable suds caching
+    - [c282636] Honor volume:get policy
+    - [da65d08] Prevent tenant viewing volumes owned by another
+    - [5f88296] Fix performance issues with brocade zone driver.
+    - [36406c9] Cache snapshots in request for extension
+    - [ce35e7a] volume_image_metadata missing from volume list
+    - [69ade10] Add retry_on_deadlock to db update methods
+    - [3b4d5b0] Add fix for reservation index to icehouse
+    - [360705a] vmware: Force chunked transfer for upload-to-image
+  * d/p/fix-requirements.patch: Rebased.
+
+ -- Corey Bryant <[e-mail]>  Fri, 03 Oct 2014 10:22:42 -0400
+
 cinder (1:2014.1.2-0ubuntu1) trusty; urgency=medium
 
   [ Corey Bryant ]

=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2014-08-11 13:52:19 +0000
+++ debian/patches/fix-requirements.patch	2014-10-03 15:07:43 +0000
@@ -3,8 +3,6 @@
  six: 1.5.2 present in 14.04, features of 1.6.0 not used.
 Forwarded: not-needed
 
-Index: cinder/requirements.txt
-===================================================================
 --- a/requirements.txt
 +++ b/requirements.txt
 @@ -22,8 +22,7 @@
@@ -15,5 +13,5 @@
 -six>=1.6.0
 +six>=1.5.2
  SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
- sqlalchemy-migrate>=0.8.2,!=0.8.4
+ sqlalchemy-migrate>=0.8.2,!=0.8.4,!=0.9.2
  stevedore>=0.14