components/openstack/horizon/patches/11-requirements.patch
changeset 5405 66fd59fecd68
parent 3998 5bd484384122
--- a/components/openstack/horizon/patches/11-requirements.patch	Fri Feb 05 11:09:10 2016 -0800
+++ b/components/openstack/horizon/patches/11-requirements.patch	Fri Feb 05 17:54:17 2016 -0500
@@ -7,44 +7,52 @@
 
 pyscss		Not applicable
 
---- horizon-2014.2.2/horizon.egg-info/requires.txt.~1~	2015-02-05 09:08:25.000000000 -0800
-+++ horizon-2014.2.2/horizon.egg-info/requires.txt	2015-02-25 00:24:13.790331173 -0800
-@@ -3,13 +3,10 @@ Django>=1.4.2,<1.7
- django_compressor>=1.4
- django_openstack_auth>=1.1.7,!=1.1.8
- django-pyscss>=1.0.3  # BSD License2 clause
--eventlet>=0.15.1,<0.16.0
+cinderclient	push to version 1.3.1
+
+--- horizon-2015.1.2/horizon.egg-info/requires.txt.orig	2015-10-13 11:09:26.000000000 -0600
++++ horizon-2015.1.2/horizon.egg-info/requires.txt	2015-11-19 15:15:17.976212795 -0700
+@@ -5,19 +5,16 @@ Pint>=0.5 # BSD
+ django-compressor>=1.4
+ django-openstack-auth<1.3.0,>=1.2.0
+ django-pyscss<2.0.0,>=1.0.3 # BSD License2 clause
+-eventlet!=0.17.0,>=0.16.1
  httplib2>=0.7.5
  iso8601>=0.1.9
 -kombu>=2.5.0
- lockfile>=0.8
  netaddr>=0.7.12
--pyScss>=1.2.1,<1.3  # MIT License
- python-ceilometerclient>=1.0.6
- python-cinderclient>=1.1.0
- python-glanceclient>=0.14.0
-@@ -40,4 +37,4 @@ xstatic-jquery-ui>=1.10.1  # MIT License
- xstatic-jsencrypt>=2.0.0.2  # MIT License
- xstatic-qunit>=1.14.0.2  # MIT License
- xstatic-rickshaw>=1.5.0  # BSD Licenseprior
--xstatic-spin>=1.2.5.2  # MIT License
-+xstatic-spin>=1.2.5.2  # MIT License
-\ No newline at end of file
---- horizon-2014.2.2/requirements.txt.~1~	2015-02-05 09:06:50.000000000 -0800
-+++ horizon-2014.2.2/requirements.txt	2015-02-25 00:24:12.542805712 -0800
-@@ -13,15 +13,12 @@ Django>=1.4.2,<1.7
- django_compressor>=1.4
- django_openstack_auth>=1.1.7,!=1.1.8
- django-pyscss>=1.0.3  # BSD License (2 clause)
--eventlet>=0.15.1,<0.16.0
+ oslo.concurrency<1.9.0,>=1.8.2 # Apache-2.0
+ oslo.config<1.10.0,>=1.9.3 # Apache-2.0
+ oslo.i18n<1.6.0,>=1.5.0 # Apache-2.0
+ oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
+ oslo.utils!=1.4.1,<1.5.0,>=1.4.0 # Apache-2.0
+-pyScss<1.3,>=1.2.1 # MIT License
+ python-ceilometerclient<1.2,>=1.1.1
+-python-cinderclient<1.2.0,>=1.1.0
++python-cinderclient<=1.3.1,>=1.1.0
+ python-glanceclient<0.18.0,>=0.15.0
+ python-heatclient<0.5.0,>=0.3.0
+ python-keystoneclient<1.4.0,>=1.2.0
+
+--- horizon-2015.1.2/requirements.txt.orig	2015-10-13 11:07:24.000000000 -0600
++++ horizon-2015.1.2/requirements.txt	2015-11-19 15:16:14.438547386 -0700
+@@ -15,19 +15,16 @@ Pint>=0.5 # BSD
+ django-compressor>=1.4
+ django-openstack-auth<1.3.0,>=1.2.0
+ django-pyscss<2.0.0,>=1.0.3 # BSD License (2 clause)
+-eventlet!=0.17.0,>=0.16.1
  httplib2>=0.7.5
  iso8601>=0.1.9
 -kombu>=2.5.0
- # Horizon Utility Requirements
- # for SECURE_KEY generation
- lockfile>=0.8
  netaddr>=0.7.12
--pyScss>=1.2.1,<1.3  # MIT License
- python-ceilometerclient>=1.0.6
- python-cinderclient>=1.1.0
- python-glanceclient>=0.14.0
+ oslo.concurrency<1.9.0,>=1.8.2 # Apache-2.0
+ oslo.config<1.10.0,>=1.9.3 # Apache-2.0
+ oslo.i18n<1.6.0,>=1.5.0 # Apache-2.0
+ oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
+ oslo.utils!=1.4.1,<1.5.0,>=1.4.0 # Apache-2.0
+-pyScss<1.3,>=1.2.1 # MIT License
+ python-ceilometerclient<1.2,>=1.1.1
+-python-cinderclient<1.2.0,>=1.1.0
++python-cinderclient<=1.3.1,>=1.1.0
+ python-glanceclient<0.18.0,>=0.15.0
+ python-heatclient<0.5.0,>=0.3.0
+ python-keystoneclient<1.4.0,>=1.2.0