Updated from global requirements

Change-Id: I321a9db3ff1082e226f9cf8d831c287c64d871f9

diff --git a/requirements.txt b/requirements.txt
index c8be96ccb9ec53666891550c5f8f6dba74f420d8..5ba04f255f5e3115c70094f887335bc572e912d1 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -20,9 +20,9 @@ SQLAlchemy>=0.7.8,<=0.9.99
 WebOb>=1.2.3
 python-keystoneclient>=0.9.0
 alembic>=0.4.1
-six>=1.6.0
+six>=1.7.0
 stevedore>=0.14
-oslo.config>=1.2.0
+oslo.config>=1.2.1
 oslo.rootwrap
 
 python-novaclient>=2.17.0

diff --git a/test-requirements.txt b/test-requirements.txt
index c810f788fa9a3a502f9a73d7ade11522fec27bb9..e4e4ab4f98e8f127758f6cbc8ed16c247b7871e2 100644 (file)
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,7 @@ fixtures>=0.3.14
 mock>=1.0
 python-subunit>=0.0.18
 ordereddict
-sphinx>=1.2.1,<1.3
+sphinx>=1.1.2,!=1.2.0,<1.3
 oslosphinx
 testrepository>=0.0.18
 testtools>=0.9.34