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

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-30 12:48:08 +0000
+++ debian/changelog	2015-06-22 15:29:04 +0000
@@ -1,3 +1,13 @@
+cinder (1:2014.1.5-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/icehouse (d03ca5d) (LP: #1467533):
+    - [bc0549e] Disallow backing files when uploading volumes to image
+    - [15901c4] Deal with PEP-0476 certificate chaining checking
+    - [d03ca5d] Ignore HTTP_PROXY during test requests
+  * d/p/fix-requirements.patch: Rebased
+
+ -- Corey Bryant <[e-mail]>  Mon, 22 Jun 2015 10:12:20 -0400
+
 cinder (1:2014.1.4-0ubuntu2) trusty; urgency=medium
 
   * d/control: Set minimum python-six dependency to 1.5.2 (LP: #1403114).

=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2015-03-16 18:14:41 +0000
+++ debian/patches/fix-requirements.patch	2015-06-22 15:29:04 +0000
@@ -6,12 +6,12 @@
 --- a/requirements.txt
 +++ b/requirements.txt
 @@ -22,8 +22,7 @@
- requests>=1.1
+ requests>=1.1,<=2.6.0
  Routes>=1.12.3,!=2.0
  taskflow>=0.1.3,<0.2
 -rtslib-fb>=2.1.39
--six>=1.6.0
-+six>=1.5.2
+-six>=1.6.0,<=1.9.0
++six>=1.5.2,<=1.9.0
  SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
  sqlalchemy-migrate>=0.8.2,!=0.8.4,<=0.9.1
- stevedore>=0.14,<1.2
+ stevedore>=0.14