Merge "Updated from global requirements"

2015-10-19 20:36:01 +00:00 · 2015-10-19 20:36:01 +00:00 · b0576388f7
commit b0576388f7
parent 108b07995a 1c401eda32
2 changed files with 4 additions and 4 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -6,10 +6,10 @@ argparse
 iso8601>=0.1.9
 oslo.i18n>=1.5.0 # Apache-2.0
 oslo.serialization>=1.4.0 # Apache-2.0
-oslo.utils>=2.0.0 # Apache-2.0
+oslo.utils>=2.4.0 # Apache-2.0
 PrettyTable<0.8,>=0.7
-requests>=2.5.2
+requests!=2.8.0,>=2.5.2
 simplejson>=2.2.0
 six>=1.9.0
 Babel>=1.3
-python-keystoneclient>=1.6.0
+python-keystoneclient!=1.8.0,>=1.6.0
--- a/test-requirements.txt
+++ b/test-requirements.txt
@ -15,4 +15,4 @@ oslosphinx>=2.5.0 # Apache-2.0
 testrepository>=0.0.18
 testscenarios>=0.4
 testtools>=1.4.0
-tempest-lib>=0.9.0
+tempest-lib>=0.10.0