summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-09-23 03:30:56 +0000
committerGerrit Code Review <review@openstack.org>2015-09-23 03:30:56 +0000
commit00b060d5ad50aec3496126488e4f0cd5e5e94f45 (patch)
tree06bc68484cc812374b57b72b238fff90fe65e278
parent05e3ad8f2268bda09992e9a192b9a3dc18f60305 (diff)
parenta448add4e0e5c9c8b9990d4592c25f0e4a0c64c0 (diff)
downloadheat-00b060d5ad50aec3496126488e4f0cd5e5e94f45.tar.gz
Merge "Updated from global requirements"
-rw-r--r--requirements.txt6
-rw-r--r--setup.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/requirements.txt b/requirements.txt
index e96e24d40..5df80f6ba 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
# 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.6
+pbr>=1.6
Babel>=1.3
croniter>=0.3.4 # MIT License
cryptography>=1.0 # Apache-2.0
@@ -31,14 +31,14 @@ oslo.versionedobjects>=0.9.0
PasteDeploy>=1.5.0
pycrypto>=2.6
python-barbicanclient>=3.3.0
-python-ceilometerclient>=1.0.13
+python-ceilometerclient>=1.5.0
python-cinderclient>=1.3.1
python-designateclient>=1.0.0
python-glanceclient>=0.18.0
python-heatclient>=0.3.0
python-keystoneclient>=1.6.0
python-magnumclient>=0.2.1
-python-manilaclient>=1.2.0
+python-manilaclient>=1.3.0
python-mistralclient>=1.0.0
python-neutronclient>=2.6.0
python-novaclient>=2.28.1
diff --git a/setup.py b/setup.py
index d8080d05c..782bb21f0 100644
--- 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)