From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 15 Feb 2016 23:30:12 +0000 (+0000)
Subject: Merge "Add missing requirements"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c17da3805a908376d6395767407bed765f86a947;p=openstack-build%2Fcinder-build.git

Merge "Add missing requirements"
---

c17da3805a908376d6395767407bed765f86a947
diff --cc requirements.txt
index 592fe9673,8f246d087..74c74f974
--- a/requirements.txt
+++ b/requirements.txt
@@@ -5,13 -5,14 +5,14 @@@
  pbr>=1.6 # Apache-2.0
  anyjson>=0.3.3 # BSD
  Babel>=1.3 # BSD
+ decorator>=3.4.0  # BSD
  enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD
 -eventlet>=0.17.4 # MIT
 +eventlet>=0.18.2 # MIT
  greenlet>=0.3.2 # MIT
  iso8601>=0.1.9 # MIT
 -keystonemiddleware>=4.0.0 # Apache-2.0
 +keystonemiddleware!=4.1.0,>=4.0.0 # Apache-2.0
  lxml>=2.3 # BSD
 -oslo.config>=3.2.0 # Apache-2.0
 +oslo.config>=3.4.0 # Apache-2.0
  oslo.concurrency>=2.3.0 # Apache-2.0
  oslo.context>=0.2.0 # Apache-2.0
  oslo.db>=4.1.0 # Apache-2.0
@@@ -33,15 -34,17 +34,17 @@@ pycrypto>=2.6 # Public Domai
  pyparsing>=2.0.1 # MIT
  python-barbicanclient>=3.3.0 # Apache-2.0
  python-glanceclient>=1.2.0 # Apache-2.0
 -python-keystoneclient!=1.8.0,>=1.6.0 # Apache-2.0
 +python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0
  python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
  python-swiftclient>=2.2.0 # Apache-2.0
+ pytz>=2013.6  # MIT
  requests!=2.9.0,>=2.8.1 # Apache-2.0
  retrying!=1.3.0,>=1.2.3 # Apache-2.0
  Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7' # MIT
  Routes!=2.0,>=1.12.3;python_version!='2.7' # MIT
 -taskflow>=1.25.0 # Apache-2.0
 +taskflow>=1.26.0 # Apache-2.0
  rtslib-fb>=2.1.41 # Apache-2.0
+ simplejson>=2.2.0  # MIT
  six>=1.9.0 # MIT
  SQLAlchemy<1.1.0,>=1.0.10 # MIT
  sqlalchemy-migrate>=0.9.6 # Apache-2.0