Updated from global requirements

Change-Id: I80ae8c11f0ab6182f9924a8d5f822fd51d30d1b5

4 files changed, 21 insertions, 21 deletions

diff --git a/requirements-py3.txt b/requirements-py3.txt
index 46fd6bda..ae83b28a 100644
--- a/requirements-py3.txt
+++ b/requirements-py3.txt
@@ -9,19 +9,19 @@ Babel>=1.3
 greenlet>=0.3.2
 iso8601>=0.1.9
 Jinja2
-kombu>=2.4.8
+kombu>=2.5.0
 lockfile>=0.8
-netaddr>=0.7.6
-oslo.config>=1.4.0.0a3
+netaddr>=0.7.12
+oslo.config>=1.4.0,<1.5  # Apache-2.0
 PasteDeploy>=1.5.0
 pbr>=0.6,!=0.7,<1.0
 posix_ipc
 PrettyTable>=0.7,<0.8
 pycrypto>=2.6
-requests>=1.2.1
+requests>=1.2.1,!=2.4.0
 Routes>=1.12.3,!=2.0
 six>=1.7.0
 SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99
-sqlalchemy-migrate>=0.9.1
-stevedore>=0.14
+sqlalchemy-migrate>=0.9.1,!=0.9.2
+stevedore>=1.0.0,<1.2  # Apache-2.0
 WebOb>=1.2.3
diff --git a/requirements.txt b/requirements.txt
index 8ef0e5e1..7225162e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,24 +7,24 @@ alembic>=0.6.4
 anyjson>=0.3.3
 argparse
 Babel>=1.3
-eventlet>=0.13.0
+eventlet>=0.15.1
 greenlet>=0.3.2
 iso8601>=0.1.9
 Jinja2
-kombu>=2.4.8
+kombu>=2.5.0
 lockfile>=0.8
-netaddr>=0.7.6
-oslo.config>=1.4.0.0a3
+netaddr>=0.7.12
+oslo.config>=1.4.0,<1.5  # Apache-2.0
 PasteDeploy>=1.5.0
 posix_ipc
 PrettyTable>=0.7,<0.8
-pycadf>=0.5.1
+pycadf>=0.6.0
 pycrypto>=2.6
 qpid-python
-requests>=1.2.1
+requests>=1.2.1,!=2.4.0
 Routes>=1.12.3,!=2.0
 six>=1.7.0
 SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99
-sqlalchemy-migrate>=0.9.1
-stevedore>=0.14
+sqlalchemy-migrate>=0.9.1,!=0.9.2
+stevedore>=1.0.0,<1.2  # Apache-2.0
 WebOb>=1.2.3
diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt
index 92312478..307eb842 100644
--- a/test-requirements-py3.txt
+++ b/test-requirements-py3.txt
@@ -6,10 +6,10 @@ coverage>=3.6
 discover
 fixtures>=0.3.14
 hacking>=0.9.1,<0.10
-oslotest
+oslotest>=1.1.0,<1.4  # Apache-2.0
 pyzmq>=14.3.1 # LGPL+BSD
 redis
-simplejson>=2.0.9
+simplejson>=2.2.0
 sphinx>=1.1.2,!=1.2.0,<1.3
 testrepository>=0.0.18
-testtools>=0.9.34
+testtools>=0.9.34,!=1.4.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 6c4d52c0..16575ed9 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,13 +7,13 @@ discover
 fixtures>=0.3.14
 hacking>=0.9.1,<0.10
 MySQL-python
-oslosphinx
-oslotest
+oslosphinx>=2.2.0  # Apache-2.0
+oslotest>=1.1.0,<1.4  # Apache-2.0
 pylint==0.25.2
 pyzmq>=14.3.1 # LGPL+BSD
 redis
-simplejson>=2.0.9
+simplejson>=2.2.0
 sphinx>=1.1.2,!=1.2.0,<1.3
 testrepository>=0.0.18
 testscenarios>=0.4
-testtools>=0.9.34
+testtools>=0.9.34,!=1.4.0