Merge "Sync with global-requirements"

requirements.txt

@@ -7,7 +7,7 @@ jsonschema>=2.0.0,<3.0.0
 kombu>=2.4.8
 lockfile>=0.8
 netaddr>=0.7.6
-oslo.config>=1.2.0
+oslo.config>=1.2.1
 oslo.messaging>=1.3.0
 oslo.rootwrap
 Paste
@@ -17,7 +17,7 @@ pecan>=0.4.5
 python-keystoneclient>=0.9.0
 python-neutronclient>=2.3.4,<3
 Routes>=1.12.3
-six>=1.6.0
+six>=1.7.0
 SQLAlchemy>=0.7.8,<=0.9.99
 sqlalchemy-migrate>=0.9.1
 stevedore>=0.14

test-requirements.txt

@@ -6,7 +6,7 @@ fixtures>=0.3.14
 mock>=1.0
 mox>=0.5.3
 python-subunit>=0.0.18
-sphinx>=1.2.1,<1.3
+sphinx>=1.1.2,!=1.2.0,<1.3
 sphinxcontrib-httpdomain
 testtools>=0.9.34
 testrepository>=0.0.18