Updated from global requirements

Change-Id: Ibcb49412a012f79be2f7fd697349ddbf43bd7b9b

diff --git a/requirements.txt b/requirements.txt
index 8d5041c38abac20df7bccff0766cae5d9cb6cfa8..ff8e0d6077954ef90bd568019c956a7ae4228d55 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ pbr<2.0,>=0.11
 
 Paste
 PasteDeploy>=1.5.0
-Routes!=2.0,>=1.12.3
+Routes!=2.0,!=2.1,>=1.12.3
 debtcollector>=0.3.0 # Apache-2.0
 eventlet>=0.17.4
 greenlet>=0.3.2
@@ -25,10 +25,10 @@ stevedore>=1.5.0 # Apache-2.0
 oslo.concurrency>=2.1.0 # Apache-2.0
 oslo.config>=1.11.0 # Apache-2.0
 oslo.context>=0.2.0 # Apache-2.0
-oslo.db>=1.10.0 # Apache-2.0
+oslo.db>=1.12.0 # Apache-2.0
 oslo.i18n>=1.5.0 # Apache-2.0
 oslo.log>=1.2.0 # Apache-2.0
-oslo.messaging!=1.12.0,>=1.8.0 # Apache-2.0
+oslo.messaging>=1.16.0 # Apache-2.0
 oslo.middleware!=2.0.0,>=1.2.0 # Apache-2.0
 oslo.policy>=0.5.0 # Apache-2.0
 oslo.rootwrap>=2.0.0 # Apache-2.0

diff --git a/test-requirements.txt b/test-requirements.txt
index 6693ab22eed29970f01084d1cf6c2a4e0c6575f7..56d3e8178516638f80734342027985e44d182b10 100644 (file)
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,7 +6,8 @@ hacking<0.11,>=0.10.0
 cliff>=1.13.0 # Apache-2.0
 coverage>=3.6
 fixtures>=1.3.1
-mock>=1.0
+mock>=1.1;python_version!='2.6'
+mock==1.0.1;python_version=='2.6'
 python-subunit>=0.0.18
 requests-mock>=0.6.0 # Apache-2.0
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
@@ -17,5 +18,5 @@ testscenarios>=0.4
 WebTest>=2.0
 oslotest>=1.5.1 # Apache-2.0
 os-testr>=0.1.0
-tempest-lib>=0.5.0
+tempest-lib>=0.6.1
 ddt>=0.7.0