Merge "Updated from global requirements"

2014-10-12 06:01:14 +00:00 · 2014-10-12 06:01:14 +00:00 · 53b0e04ba1
commit 53b0e04ba1
parent b1ca067cda 685f6c9a7f
2 changed files with 2 additions and 2 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -21,7 +21,7 @@ netaddr>=0.7.12
 python-neutronclient>=2.3.6,<3
 SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99
 WebOb>=1.2.3
-python-keystoneclient>=0.10.0
+python-keystoneclient>=0.11.1
 alembic>=0.6.4
 six>=1.7.0
 stevedore>=1.0.0  # Apache-2.0
--- a/test-requirements.txt
+++ b/test-requirements.txt
@ -11,7 +11,7 @@ mock>=1.0
 python-subunit>=0.0.18
 ordereddict
 requests-mock>=0.4.0  # Apache-2.0
-sphinx>=1.1.2,!=1.2.0,<1.3
+sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
 oslosphinx>=2.2.0  # Apache-2.0
 testrepository>=0.0.18
 testtools>=0.9.34