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

[Corey Bryant]

Ubuntu Stable Release Update for OpenStack Icehouse

[Chuck Short (zulcss)]

See inline comments.

review: Needs Fixing

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

181. By Corey Bryant on 2014-06-09

* debian/patches/fix-requirements.patch: Refreshed.
* Resynchronize with stable/icehouse (aa0e752) (LP: #1328134):
  - [d58abc1] Update cinder.conf
  - [5330d3b] Updated from global requirements
  - [41127fb] Properly initialize rpc in cinder-volume-usage-audit
  - [75fa69d] Storwize/SVC driver crashes when check volume copy status
  - [bc585a0] Fix solaris_execute in SolarisISCSIDriver.
  - [bc0442a] Fix wrong exception reference
  - [59fe59e] Correct metadata ordering issue in tests
  - [1e48833] Fallback to None on missing Glance image attrs
  - [767c2a6] Keep volume available if retype fails due to quota
  - [d0602f6] Fixes cinder error state volume delete on Windows
  - [1815c72] Re-raise exceptions in upload-to-image
  - [560740f] GlusterFS: Delete active snapshot file on volume delete.
  - [d17277d] Add exception catch if Storwize/SVC driver failed when retyping
  - [49446bc] Disable oslo.messaging debug logs
  - [aa0e752] Adjust sample config for keystoneclient 0.8.0 release

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-17 10:32:18 +0000
+++ debian/changelog	2014-06-09 18:43:44 +0000
@@ -1,3 +1,25 @@
+cinder (1:2014.1.1-0ubuntu1) trusty; urgency=medium
+
+  * debian/patches/fix-requirements.patch: Refreshed.
+  * Resynchronize with stable/icehouse (aa0e752) (LP: #1328134):
+    - [d58abc1] Update cinder.conf
+    - [5330d3b] Updated from global requirements
+    - [41127fb] Properly initialize rpc in cinder-volume-usage-audit
+    - [75fa69d] Storwize/SVC driver crashes when check volume copy status
+    - [bc585a0] Fix solaris_execute in SolarisISCSIDriver.
+    - [bc0442a] Fix wrong exception reference
+    - [59fe59e] Correct metadata ordering issue in tests
+    - [1e48833] Fallback to None on missing Glance image attrs
+    - [767c2a6] Keep volume available if retype fails due to quota
+    - [d0602f6] Fixes cinder error state volume delete on Windows
+    - [1815c72] Re-raise exceptions in upload-to-image
+    - [560740f] GlusterFS: Delete active snapshot file on volume delete.
+    - [d17277d] Add exception catch if Storwize/SVC driver failed when retyping
+    - [49446bc] Disable oslo.messaging debug logs
+    - [aa0e752] Adjust sample config for keystoneclient 0.8.0 release
+
+ -- Corey Bryant <[e-mail]>  Mon, 09 Jun 2014 14:39:03 -0400
+
 cinder (1:2014.1-0ubuntu1) trusty; urgency=medium
 
   * New upstream release (LP: #1299055).
 
=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2014-03-26 14:31:55 +0000
+++ debian/patches/fix-requirements.patch	2014-06-09 18:43:44 +0000
@@ -1,13 +1,14 @@
-diff --git a/requirements.txt b/requirements.txt
-index 956c5de..1033d31 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -22,7 +22,6 @@ python-swiftclient>=1.6
+Index: cinder/requirements.txt
+===================================================================
+--- cinder.orig/requirements.txt	2014-06-09 14:41:57.268598007 -0400
++++ cinder/requirements.txt	2014-06-09 14:42:20.900598907 -0400
+@@ -22,8 +22,7 @@
  requests>=1.1
  Routes>=1.12.3
  taskflow>=0.1.3,<0.2
 -rtslib-fb>=2.1.39
- six>=1.5.2
+-six>=1.6.0
++six>=1.5.2
  SQLAlchemy>=0.7.8,<=0.9.99
  sqlalchemy-migrate>=0.8.2,!=0.8.4
-
+ stevedore>=0.14