Merge "Updated from global requirements"

requirements.txt

@@ -14,7 +14,7 @@ greenlet>=0.3.2
 httplib2>=0.7.5
 requests>=2.8.1
 Jinja2>=2.8 # BSD License (3 clause)
-keystonemiddleware!=2.4.0,>=2.0.0
+keystonemiddleware>=4.0.0
 netaddr!=0.7.16,>=0.7.12
 python-neutronclient>=2.6.0
 retrying!=1.3.0,>=1.2.3 # Apache-2.0
@@ -31,13 +31,13 @@ oslo.context>=0.2.0 # Apache-2.0
 oslo.db>=3.2.0 # Apache-2.0
 oslo.i18n>=1.5.0 # Apache-2.0
 oslo.log>=1.12.0 # Apache-2.0
-oslo.messaging!=2.8.0,>2.6.1 # Apache-2.0
+oslo.messaging!=2.8.0,!=3.1.0,>2.6.1 # Apache-2.0
 oslo.middleware>=3.0.0 # Apache-2.0
 oslo.policy>=0.5.0 # Apache-2.0
 oslo.reports>=0.6.0  # Apache-2.0
 oslo.rootwrap>=2.0.0 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
-oslo.service>=0.12.0 # Apache-2.0
+oslo.service>=1.0.0 # Apache-2.0
 oslo.utils>=2.8.0 # Apache-2.0
 oslo.versionedobjects>=0.13.0
 

test-requirements.txt

@@ -19,8 +19,8 @@ WebTest>=2.0
 oslotest>=1.10.0 # Apache-2.0
 os-testr>=0.4.1
 tempest-lib>=0.11.0
-ddt>=0.7.0
-pylint==1.4.4 # GNU GPL v2
+ddt>=1.0.1
+pylint==1.4.5 # GNU GPL v2
 reno>=0.1.1 # Apache2
 # Needed to run DB commands in virtualenvs
 PyMySQL>=0.6.2 # MIT License