Merge "Updated from global requirements"

This commit is contained in:
Jenkins
2015-10-21 15:55:46 +00:00
committed by Gerrit Code Review
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -9,5 +9,5 @@ python-keystoneclient!=1.8.0,>=1.6.0
requests!=2.8.0,>=2.5.2
warlock<2,>=1.0.1
six>=1.9.0
oslo.utils>=2.4.0 # Apache-2.0
oslo.utils!=2.6.0,>=2.4.0 # Apache-2.0
oslo.i18n>=1.5.0 # Apache-2.0
+1 -1
View File
@@ -6,7 +6,7 @@ hacking<0.11,>=0.10.0
coverage>=3.6
discover
mock>=1.2
os-client-config>=1.4.0,!=1.6.2
os-client-config!=1.6.2,>=1.4.0
oslosphinx>=2.5.0 # Apache-2.0
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
testrepository>=0.0.18