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

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-30 12:54:47 +0000
+++ debian/changelog	2015-06-22 15:29:34 +0000
@@ -1,3 +1,11 @@
+glance (1:2014.1.5-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/icehouse (f66170d) (LP: #1467533):
+    - [f66170d] Fix Icehouse RBD delete image on creation failure
+  * d/p/fix-requirements.patch: Rebased
+
+ -- Corey Bryant <[e-mail]>  Mon, 22 Jun 2015 10:12:40 -0400
+
 glance (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:31:03 +0000
+++ debian/patches/fix-requirements.patch	2015-06-22 15:29:34 +0000
@@ -4,10 +4,10 @@
 --- a/requirements.txt
 +++ b/requirements.txt
 @@ -39,6 +39,6 @@
- pyOpenSSL>=0.11
+ pyOpenSSL>=0.11,<=0.14
  
  # Required by openstack.common libraries
--six>=1.6.0
-+six>=1.5.2
+-six>=1.6.0,<=1.9.0
++six>=1.5.2,<=1.9.0
  
  oslo.messaging>=1.3.0,<1.5