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

[Corey Bryant]

Ubuntu Stable Release Update for OpenStack Icehouse

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

296. By Corey Bryant on 2014-06-13

* Resynchronize with stable/icehouse (cd1c30a) (LP: #1328134):
  - [19de115] Prevent creation of http images with invalid URIs
  - [e96a53a] Fixes installation of test-requirements
  - [cd1c30a] Updated from global requirements

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-17 11:46:19 +0000
+++ debian/changelog	2014-06-13 16:25:49 +0000
@@ -1,3 +1,12 @@
+glance (1:2014.1.1-0ubuntu1) trusty; urgency=medium
+
+  * Resynchronize with stable/icehouse (cd1c30a) (LP: #1328134):
+    - [19de115] Prevent creation of http images with invalid URIs
+    - [e96a53a] Fixes installation of test-requirements
+    - [cd1c30a] Updated from global requirements
+
+ -- Corey Bryant <[e-mail]>  Mon, 09 Jun 2014 14:55:05 -0400
+
 glance (1:2014.1-0ubuntu1) trusty; urgency=medium
 
   * New upstream release (LP: #1299055).
 
=== added file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-requirements.patch	2014-06-13 16:25:49 +0000
@@ -0,0 +1,15 @@
+Description: Set min version of six.
+Author: Corey Bryant <[e-mail]>
+Forwarded: Not needed.
+Index: glance/requirements.txt
+===================================================================
+--- glance.orig/requirements.txt	2014-06-13 10:13:33.028556468 -0400
++++ glance/requirements.txt	2014-06-13 11:33:56.440409418 -0400
+@@ -38,6 +38,6 @@
+ pyOpenSSL>=0.11
+ 
+ # Required by openstack.common libraries
+-six>=1.6.0
++six>=1.5.2
+ 
+ oslo.messaging>=1.3.0a9
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2014-04-12 12:45:23 +0000
+++ debian/patches/series	2014-06-13 16:25:49 +0000
@@ -1,2 +1,3 @@
 sql_conn.patch
 skip-tests.patch
+fix-requirements.patch