commit 08e2863a6b4b774307c2a3647826aba0fd2d22d7
author Zuul <zuul@review.openstack.org> Mon Mar 26 04:12:02 2018 +0000
committer Gerrit Code Review <review@openstack.org> Mon Mar 26 04:12:02 2018 +0000
tree 57abebc561dd221f32c3ae96f2d13754ca6ffdf1
parent 78f3327364345164a52ac6bbf0c7df0fa1ae8951
parent 7bb172aab6a2f59dbbe404b19d16daf60be3f951

Merge "Updated from global requirements"

requirements.txt

diff --git a/requirements.txt b/requirements.txt
index 9f8c683..67ae150 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,6 +5,6 @@
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 
 tempest>=17.1.0 # Apache-2.0
-cryptography!=2.0,>=1.9 # BSD/Apache-2.0
+cryptography>=2.1 # BSD/Apache-2.0
 
-oslo.config>=5.1.0 # Apache-2.0
+oslo.config>=5.2.0 # Apache-2.0

test-requirements.txt

diff --git a/test-requirements.txt b/test-requirements.txt
index a89f7d2..b858041 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,7 +5,7 @@
 hacking<0.13,>=0.12.0 # Apache-2.0
 
 python-subunit>=1.0.0 # Apache-2.0/BSD
-sphinx!=1.6.6,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
 oslosphinx>=4.7.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD