components/openstack/cinder/patches/01-requirements.patch
branchs11u3-sru
changeset 4937 8f0976d7e40e
parent 4072 db0cec748ec0
child 5405 66fd59fecd68
--- a/components/openstack/cinder/patches/01-requirements.patch	Fri Oct 09 09:55:13 2015 -0700
+++ b/components/openstack/cinder/patches/01-requirements.patch	Fri Oct 09 11:54:18 2015 -0700
@@ -1,19 +1,17 @@
 In-house patch to remove unnecessary dependencies from Cinder's
 requirements files. The specific reasons are as follows:
 
-kombu		Not applicable
+kombu           Not applicable
 
-oslo.rootwrap	Not applicable to Solaris
+oslo.rootwrap   Not applicable to Solaris
 
-paramiko	Not applicable to Solaris (various drivers specific)
+pycrypto        Not applicable to Solaris (various drivers specific)
 
-pycrypto	Not applicable to Solaris (various drivers specific)
-
-rtslib-fb	Not applicable to Solaris (Linux iSCSI specific)
+rtslib-fb       Not applicable to Solaris (Linux iSCSI specific)
 
---- cinder-2014.2.2/cinder.egg-info/requires.txt.~1~	2015-02-05 08:05:50.000000000 -0800
-+++ cinder-2014.2.2/cinder.egg-info/requires.txt	2015-02-23 13:49:52.736413251 -0800
-@@ -6,18 +6,14 @@ eventlet>=0.15.1,<0.16.0
+--- cinder-2014.2.2/cinder.egg-info/requires.txt.orig	2015-05-27 22:55:59.906826810 -0700
++++ cinder-2014.2.2/cinder.egg-info/requires.txt	2015-05-27 22:57:00.022877081 -0700
+@@ -6,18 +6,15 @@
  greenlet>=0.3.2
  iso8601>=0.1.9
  keystonemiddleware>=1.0.0
@@ -25,14 +23,14 @@
  oslo.messaging>=1.4.0,!=1.5.0,<1.6.0
 -oslo.rootwrap>=1.3.0
  osprofiler>=0.3.0                       # Apache-2.0
--paramiko>=1.13.0
+ paramiko>=1.13.0
  Paste
  PasteDeploy>=1.5.0
 -pycrypto>=2.6
  python-barbicanclient>=2.1.0,!=3.0.0,<3.0.2
  python-glanceclient>=0.14.0
  python-novaclient>=2.18.0
-@@ -25,7 +21,6 @@ python-swiftclient>=2.2.0
+@@ -25,7 +22,6 @@
  requests>=1.2.1,!=2.4.0
  Routes>=1.12.3,!=2.0
  taskflow>=0.4,<0.7.0
@@ -40,9 +38,9 @@
  six>=1.7.0
  SQLAlchemy>=0.8.4,<=0.9.99,!=0.9.0,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4,!=0.9.5,!=0.9.6
  sqlalchemy-migrate==0.9.1
---- cinder-2014.2.2/requirements.txt.~1~	2015-02-05 08:03:26.000000000 -0800
-+++ cinder-2014.2.2/requirements.txt	2015-02-23 13:52:20.137709426 -0800
-@@ -10,18 +10,14 @@ eventlet>=0.15.1,<0.16.0
+--- cinder-2014.2.2/requirements.txt.orig       2015-05-27 22:57:45.226877884 -0700
++++ cinder-2014.2.2/requirements.txt    2015-05-27 22:58:25.817248288 -0700
+@@ -10,18 +10,15 @@
  greenlet>=0.3.2
  iso8601>=0.1.9
  keystonemiddleware>=1.0.0
@@ -54,14 +52,14 @@
  oslo.messaging>=1.4.0,!=1.5.0,<1.6.0
 -oslo.rootwrap>=1.3.0
  osprofiler>=0.3.0                       # Apache-2.0
--paramiko>=1.13.0
+ paramiko>=1.13.0
  Paste
  PasteDeploy>=1.5.0
 -pycrypto>=2.6
  python-barbicanclient>=2.1.0,!=3.0.0,<3.0.2
  python-glanceclient>=0.14.0
  python-novaclient>=2.18.0
-@@ -29,7 +25,6 @@ python-swiftclient>=2.2.0
+@@ -29,7 +26,6 @@
  requests>=1.2.1,!=2.4.0
  Routes>=1.12.3,!=2.0
  taskflow>=0.4,<0.7.0
@@ -69,3 +67,4 @@
  six>=1.7.0
  SQLAlchemy>=0.8.4,<=0.9.99,!=0.9.0,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4,!=0.9.5,!=0.9.6
  sqlalchemy-migrate==0.9.1
+