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

[Corey Bryant]

[James Page (james-page)]

review: Approve

[lp:~corey.bryant/cinder/2014.1.4]

186. By James Page on 2015-03-19

releasing package cinder version 1:2014.1.4-0ubuntu1

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-03 20:06:25 +0000
+++ debian/changelog	2015-03-16 18:21:22 +0000
@@ -1,3 +1,30 @@
+cinder (1:2014.1.4-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/icehouse (93de51d) (LP: #1432608):
+    - [303d021] Catch ImageNotFound exception when deleting rbd volume
+    - [f8dea5a] NetApp E-series: Do not log passwords in requests
+    - [97a7e20] Fixes HostTestCase failures due to slow test run
+    - [2670384] NetApp 7mode NFS driver doesn't honor netapp_vfiler option
+    - [6aa4bca] Raise exception if invalid IP is specified
+    - [1142830] Fix NetApp AutoSupport Shortcomings.
+    - [e446335] Remove check_uptodate.sh check from tox.ini
+    - [4041d30] Eventlet green threads not released back to pool
+    - [1d48d01] Removes unecessary call to rbd.Image
+    - [4a14db7] Ensure rbd connect exception is properly caught
+    - [b05498d] NetApp fix attach fail for already mapped volume
+    - [f5bf67a] NetApp fix for controller preferred path
+    - [d57b339] fixing the iSER transport protocol when using LVMISERDriver
+    - [24759d9] Cinder api service doesn't handle SIGHUP properly
+    - [3821206] Sync latest strutils from oslo-incubator for mask_password fix
+    - [71b5315] NetApp fix for default host type in eseries
+    - [0b8455a] NetApp fix eseries concurrent vol map failure
+    - [ffc886b] Fix possible race condition for accept transfer
+    - [390259b] Sync process utils from oslo
+    - [93de51d] Fix NetAppDirectCmodeNfsDriver._find_shares()
+  * d/p/fix-requirements.patch: Rebased
+
+ -- Corey Bryant <[e-mail]>  Mon, 16 Mar 2015 14:04:14 -0400
+
 cinder (1:2014.1.3-0ubuntu1) trusty; urgency=medium
 
   [ Corey Bryant ]

=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2014-10-03 14:57:20 +0000
+++ debian/patches/fix-requirements.patch	2015-03-16 18:21:22 +0000
@@ -13,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,!=0.9.2
- stevedore>=0.14
+ sqlalchemy-migrate>=0.8.2,!=0.8.4,<=0.9.1
+ stevedore>=0.14,<1.2