← Back to branch summary

~ubuntu-server-dev/cinder/icehouse

« back to all changes in this revision

Viewing changes to debian/patches/fix-requirements.patch

  • Committer: Chuck Short
  • Date: 2015-06-23 00:11:54 UTC
  • mfrom: (188.1.1 cinder)
  • Revision ID: zulcss@ubuntu.com-20150623001154-6mksms5mhnblikeu
https://launchpad.net/bugs/1467533
* 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

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix-requirements.patch
6
6
--- a/requirements.txt
7
7
+++ b/requirements.txt
8
8
@@ -22,8 +22,7 @@
9
 
 requests>=1.1
 
9
 requests>=1.1,<=2.6.0
10
10
 Routes>=1.12.3,!=2.0
11
11
 taskflow>=0.1.3,<0.2
12
12
-rtslib-fb>=2.1.39
13
 
-six>=1.6.0
14
 
+six>=1.5.2
 
13
-six>=1.6.0,<=1.9.0
 
14
+six>=1.5.2,<=1.9.0
15
15
 SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
16
16
 sqlalchemy-migrate>=0.8.2,!=0.8.4,<=0.9.1
17
 
 stevedore>=0.14,<1.2
 
17
 stevedore>=0.14