summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenStack Jenkins <jenkins@openstack.org>2013-10-10 20:24:27 +0000
committerOpenStack Jenkins <jenkins@openstack.org>2013-10-10 20:24:27 +0000
commit5050baf28cbc10e57913ac090fe19196b47d9feb (patch)
tree415d0e6f2a1ccd4f0d53629d0989e8c78e1a7eea
parentd951222c1440b31f5e994d43b4277344e0d8f63f (diff)
downloadcinder-5050baf28cbc10e57913ac090fe19196b47d9feb.tar.gz
Updated from global requirements
Change-Id: Ic2508231560ea1bd7d8c8df01193846bec4f70cc
-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 219962d4a..d410b0385 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,16 +10,16 @@ kombu>=2.4.8
lockfile>=0.8
lxml>=2.3
netaddr
-oslo.config>=1.1.0
+oslo.config>=1.2.0
paramiko>=1.8.0
Paste
PasteDeploy>=1.5.0
python-glanceclient>=0.9.0
-python-keystoneclient>=0.3.0
+python-keystoneclient>=0.3.2
python-novaclient>=2.15.0
python-swiftclient>=1.5
Routes>=1.12.3
-six
+six>=1.4.1
SQLAlchemy>=0.7.8,<=0.7.99
sqlalchemy-migrate>=0.7.2
stevedore>=0.10
diff --git a/setup.py b/setup.py
index 2a0786a8b..70c2b3f32 100644
--- a/setup.py
+++ b/setup.py
@@ -18,5 +18,5 @@
import setuptools
setuptools.setup(
- setup_requires=['pbr>=0.5.21,<1.0'],
+ setup_requires=['pbr'],
pbr=True)