Merge "Updated from global requirements"

requirements-py3.txt

@@ -13,6 +13,6 @@ python-keystoneclient>=0.9.0
 # python-memcached>=1.48
 WebOb>=1.2.3
 stevedore>=0.14
-six>=1.6.0
-oslo.config>=1.2.0
+six>=1.7.0
+oslo.config>=1.2.1
 SQLAlchemy>=0.7.8,<=0.9.99

requirements.txt

@@ -12,6 +12,6 @@ python-keystoneclient>=0.9.0
 python-memcached>=1.48
 WebOb>=1.2.3
 stevedore>=0.14
-six>=1.6.0
-oslo.config>=1.2.0
+six>=1.7.0
+oslo.config>=1.2.1
 SQLAlchemy>=0.7.8,<=0.9.99

test-requirements-py3.txt

@@ -17,7 +17,7 @@ testtools>=0.9.34
 requests>=1.1
 
 # Documentation
-sphinx>=1.2.1,<1.3
+sphinx>=1.1.2,!=1.2.0,<1.3
 oslosphinx
-openstack-doc-tools>=0.13
+openstack-doc-tools>=0.15
 

test-requirements.txt

@@ -17,7 +17,7 @@ testtools>=0.9.34
 requests>=1.1
 
 # Documentation
-sphinx>=1.2.1,<1.3
+sphinx>=1.1.2,!=1.2.0,<1.3
 oslosphinx
-openstack-doc-tools>=0.13
+openstack-doc-tools>=0.15