Merge "Updated from global requirements" into stable/liberty

2015-10-01 21:37:31 +00:00 · 2015-10-01 21:37:31 +00:00 · b7a6b78a0c
parent 8405446a08 75a2e259bb
commit b7a6b78a0c
2 changed files with 2 additions and 2 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -8,7 +8,7 @@ oslo.context>=0.2.0 # Apache-2.0
 oslo.i18n>=1.5.0 # Apache-2.0
 oslo.serialization>=1.4.0 # Apache-2.0
 oslo.utils>=2.0.0 # Apache-2.0
-pbr<2.0,>=1.6
+pbr>=1.6
 pycadf>=1.1.0
 python-keystoneclient>=1.6.0
 requests>=2.5.2
--- a/setup.py
+++ b/setup.py
@ -25,5 +25,5 @@ except ImportError:
    pass

 setuptools.setup(
-    setup_requires=['pbr>=1.3'],
+    setup_requires=['pbr>=1.8'],
    pbr=True)