Merge "Updated from global requirements"

2015-08-13 13:49:47 +00:00 · 2015-08-13 13:49:47 +00:00 · 7bfe4fdf31
commit 7bfe4fdf31
parent 002adfb5f2 f55a8ea954
2 changed files with 2 additions and 2 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -2,6 +2,6 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.

-pbr<2.0,>=1.3
+pbr<2.0,>=1.4
 Babel>=1.3
 six>=1.9.0
--- a/test-requirements.txt
+++ b/test-requirements.txt
@ -12,4 +12,4 @@ oslotest>=1.10.0 # Apache-2.0
 coverage>=3.6

 # for pre-release tests
-oslo.config>=1.11.0 # Apache-2.0
+oslo.config>=2.1.0 # Apache-2.0