Merge lp:~thedac/cinder/kilo into lp:~ubuntu-server-dev/cinder/kilo

[David Ames]

Releasing package cinder version 1:2015.1.1-0ubuntu1

[Corey Bryant (corey.bryant)]

Thanks David. Looking pretty good. A couple of comments below.

[lp:~thedac/cinder/kilo]

234. By David Ames on 2015-08-03

Changelog fixes

[Corey Bryant (corey.bryant)]

Looks good, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-05-03 17:40:59 +0000
+++ debian/changelog	2015-08-03 20:28:55 +0000
@@ -1,3 +1,35 @@
+cinder (1:2015.1.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/kilo (651bab0) (LP: #1481008):
+    - [b130f00] Fix NetApp cDOT driver use of Glance locations
+    - [3388fff] Volume manager should set filter_function and goodness_function
+    - [08ff005] Update expected error message from lvs
+    - [27b5e75] Revert "Graceful shutdown WSGI/RPC server"
+    - [4f86ae7] Fix 'no actual-pathname' NetApp API error
+    - [70c6a35] Graceful shutdown WSGI/RPC server
+    - [6c05594] Add exception catch in report_state for DBError
+    - [50db0fc] Fix broken export commands on block_device driver
+    - [9634b76] Disallow backing files when uploading volumes to image
+    - [223b258] Fix cinder concurrency issues on rtstool
+    - [ea9e2e0] Create iSCSI lio portals with right IPs and port
+    - [f8149fc] Dispose DB connections between backend proc starts
+    - [28bb8d2] Allow provisioning to reach max oversubscription
+    - [0490f1c] Create initiator id for VMAX iSCSI driver
+    - [28df54c] Fix capacity filter to allow oversubscription
+    - [c56bbb7] VMware: Fix missing target resource pool
+    - [03562c3] Check volume_backend in retype
+    - [5ff9497] Use nfs_oversub_ratio when reporting pool capacity
+    - [9affeaf] NFS Backup: Correcting backup_sha_block_size_bytes help message
+    - [c0f12f2] LVM: Pass volume size in MiB to copy_volume() during volume migration
+    - [e316d6f] Dell: Added support for update_migrated_volume
+    - [f0a4447] Allow rexports for targets with Datera
+    - [dabbaed] HDS HNAS Driver fails when FS unhealthy
+    - [a5908fd] Revert state if attachment already exists
+    - [651bab0] VolMgr: reschedule only when filter_properties has retry
+  * d/p/fix-requirements.patch: Rebased.
+
+ -- David Ames <[e-mail]>  Mon, 03 Aug 2015 10:43:21 -0700
+
 cinder (1:2015.1.0-0ubuntu1) vivid; urgency=medium
 
   [ Chuck Short ]
 
=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2015-04-20 13:13:50 +0000
+++ debian/patches/fix-requirements.patch	2015-08-03 20:28:55 +0000
@@ -1,11 +1,11 @@
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -34,7 +34,7 @@ python-novaclient>=2.22.0,<2.24.0
- python-swiftclient>=2.2.0,<2.5.0
- requests>=2.2.0,!=2.4.0
- retrying>=1.2.3,!=1.3.0 # Apache-2.0
--Routes>=1.12.3,!=2.0
+@@ -34,7 +34,7 @@
+ python-swiftclient<2.5.0,>=2.2.0
+ requests!=2.4.0,>=2.2.0
+ retrying!=1.3.0,>=1.2.3 # Apache-2.0
+-Routes!=2.0,>=1.12.3
 +Routes>=1.12.3
- taskflow>=0.7.1,<0.8.0
+ taskflow<0.8.0,>=0.7.1
  rtslib-fb>=2.1.41
  six>=1.9.0