Updated from global requirements

Change-Id: Ib0c8c561427f141583d677e86a76cbfe4e2be606

diff --git a/requirements.txt b/requirements.txt
index e9e2db153fd076c546e3c655da3097708345581b..8bfe3bd871e631e8ef8df535b3ae6b0d7e99ff5f 100644 (file)
--- 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

diff --git a/test-requirements.txt b/test-requirements.txt
index 673a774f0f51256ae6674b22b0f601b4abdd3bd4..1ff984a4ad02ab62a664466b27ecc059de41a5e7 100644 (file)
--- 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