Merge "Updated from global requirements"

openstack · May 11, 2015 · 1fbcfff · 1fbcfff
2 parents 1656d6c + 53ecdde
commit 1fbcfff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -4,7 +4,7 @@
 cliff>=1.10.0  # Apache-2.0
 jsonschema>=2.0.0,<3.0.0
 oslo.utils>=1.4.0                       # Apache-2.0
-pbr>=0.6,!=0.7,<1.0
+pbr>=0.11,<2.0
 python-keystoneclient>=1.3.0
 requests>=2.5.2
 six>=1.9.0

diff --git a/test-requirements.txt b/test-requirements.txt
@@ -6,7 +6,7 @@ hacking>=0.9.2,<0.10
 coverage>=3.6
 mock>=1.0
 discover
-oslotest>=1.5.1
+oslotest>=1.5.1  # Apache-2.0
 python-subunit>=0.0.18
 requests-mock>=0.6.0  # Apache-2.0
 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3