Update requirements and tag up to current state

 * Tag has been updated to 2014.2.2
 * Requirements have been updated according to
   https://github.com/openstack/cinder/blob/2014.2.2/requirements.txt
   and global requirements

Change-Id: Ie4bc6bd26dd9822362caa7db8415054369238f64

diff --git a/debian/changelog b/debian/changelog
index 584a238fe9bce6a22d879047f5b00b5070c3aa8b..43d59fd0df58d2365ab36bc93a71ebec8ff4257a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cinder (1:2014.2.2-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release
+  * debian/control: Add python-oslo.i18n to Depends
+
+ -- Daniil Trishkin <dtrishkin@mirantis.com>  Mon, 02 Mar 2015 20:00:03 +0300
+
 cinder (1:2014.2~b2-0ubuntu1) utopic; urgency=medium
 
   * New upstream release.

diff --git a/debian/control b/debian/control
index c084f55c225ebe0154bba0a6c194295827412c0b..7300a28da1f263b195c6cce9f08d9caa6878d1e8 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,38 +9,38 @@ Build-Depends-Indep:
  python-coverage,
  python-eventlet (>= 0.15.1),
  python-fixtures (>= 0.3.14),
- python-glanceclient (>= 1:0.14.0 ),
+ python-glanceclient (>= 1:0.14.0),
  python-greenlet (>= 0.3.2),
  python-hacking,
  python-iso8601 (>= 0.1.9),
- python-keystonemiddleware (>= 1.0.0),
- python-kombu (>= 2.5.0),
+ python-keystonemiddleware (>= 1.0.0), python-keystonemiddleware (<< 1.4.0),
+ python-kombu (>= 3.0.7),
  python-lxml (>= 2.3),
- python-migrate (>= 0.9.1), python-migrate (<< 0.9.2) | python-migrate (>> 0.9.2),
+ python-migrate (>= 0.9.1), python-migrate (<< 0.9.2),
  python-mock,
  python-mox,
  python-mysqldb,
  python-netaddr (>= 0.7.12),
  python-novaclient (>= 2.18.0),
  python-oslo.config (>= 1:1.4.0),
- python-oslo.db (>= 1.0.0),
+ python-oslo.db (>= 1.0.0), python-oslo.db (<< 1.1),
  python-oslo.rootwrap (>= 1.3.0),
- python-oslo.messaging (>= 1.4.0),
+ python-oslo.messaging (>= 1.4.0), python-oslo.messaging (<< 1.5.0),
  python-oslosphinx,
  python-paramiko (>= 1.13.0),
  python-paste,
  python-pastedeploy (>= 1.5.0),
- python-requests (>= 1.2.1), python-requests (<< 2.4.0) | python-requests (>> 2.4.0),
+ python-requests (>= 2.1.0), python-requests (<< 2.2.2),
  python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), python-pbr (<< 1.0),
  python-routes (>= 1.12.3), python-routes (<< 2.0) | python-routes (>> 2.0),
  python-setuptools,
  python-six (>= 1.7.0),
  python-sphinx,
- python-sqlalchemy (>= 0.8.4), python-sqlalchemy (<= 0.8.99) | python-sqlalchemy (>= 0.9.7), python-sqlalchemy (<= 0.9.99),
+ python-sqlalchemy (>= 0.9.7), python-sqlalchemy (<= 0.9.99),
  python-stevedore (>= 1.0.0),
- python-suds (>= 0.4),
+ python-suds (>= 0.4), python-suds (<< 0.4.2),
  python-swiftclient (>= 2.2.0),
- python-taskflow (>= 0.4),
+ python-taskflow (>= 0.4), python-taskflow (<< 0.7.0),
  python-testtools (>= 0.9.32),
  python-webob (>= 1.2.3),
  python-subunit (>=0.0.18),
@@ -61,34 +61,35 @@ Depends:
  python-argparse,
  python-babel (>= 1.3),
  python-eventlet (>= 0.15.1),
- python-glanceclient (>= 1:0.14.0 ),
- python-requests (>= 1.2.1), python-requests (<< 2.4.0) | python-requests (>> 2.4.0),
+ python-glanceclient (>= 1:0.14.0),
+ python-requests (>= 2.1.0), python-requests (<< 2.2.2),
  python-greenlet (>= 0.3.2),
  python-iso8601 (>= 0.1.9) ,
- python-keystonemiddleware (>= 1.0.0),
- python-kombu (>= 2.5.0),
+ python-keystonemiddleware (>= 1.0.0), python-keystonemiddleware (<< 1.4.0),
+ python-kombu (>= 3.0.7),
  python-lockfile (>= 0.8),
  python-lxml (>= 2.3),
- python-migrate (>= 0.9.1), python-migrate (<< 0.9.2) | python-migrate (>> 0.9.2),
+ python-migrate (>= 0.9.1), python-migrate (<< 0.9.2),
  python-netaddr (>= 0.7.12),
  python-novaclient (>= 1:2.18.0),
  python-oslo.config (>= 1:1.4.0),
- python-oslo.db (>= 1.0.0),
- python-oslo.messaging (>= 1.4.0),
+ python-oslo.db (>= 1.0.0), python-oslo.db (<< 1.1),
+ python-oslo.messaging (>= 1.4.0), python-oslo.messaging (<< 1.5.0),
  python-oslo.rootwrap (>= 1.3.0),
+ python-oslo.i18n (>= 1.0.0),
  python-osprofiler (>= 0.3.0),
  python-paramiko (>= 1.13.0),
  python-paste,
  python-pastedeploy (>= 1.5.0),
  python-crypto (>= 2.6),
- python-barbicanclient (>= 2.1.0),
+ python-barbicanclient (>= 2.1.0), python-barbicanclient (<< 3.0.0) | python-barbicanclient (>> 3.0.0), python-barbicanclient (<< 3.0.2),
  python-routes (>= 1.12.3), python-routes (<< 2.0) | python-routes (>> 2.0),
  python-six (>= 1.7.0),
- python-sqlalchemy (>= 0.8.4), python-sqlalchemy (<= 0.8.99) | python-sqlalchemy (>= 0.9.7), python-sqlalchemy (<= 0.9.99),
+ python-sqlalchemy (>= 0.9.7), python-sqlalchemy (<= 0.9.99),
  python-stevedore (>= 1.0.0),
- python-suds (>= 0.4),
+ python-suds (>= 0.4), python-suds (<< 0.4.2),
  python-swiftclient (>= 2.2.0),
- python-taskflow (>= 0.4),
+ python-taskflow (>= 0.4), python-taskflow (<< 0.7.0),
  python-rtslib-fb (>= 2.1.39),
  python-webob (>= 1.2.3),
  python-wsgiref (>= 0.1.2),

diff --git a/rpm/SPECS/openstack-cinder.spec b/rpm/SPECS/openstack-cinder.spec
index 6c9e4754e1096758c77976dafaa66da86764f21f..a69839d37945f3edf01dbcc347e55f6c7cefc1fe 100644 (file)
--- a/rpm/SPECS/openstack-cinder.spec
+++ b/rpm/SPECS/openstack-cinder.spec
@@ -1,7 +1,7 @@
 %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
 
 Name:             openstack-cinder
-Version:          2014.2
+Version:          2014.2.2
 Release:          2%{?dist}
 Summary:          OpenStack Volume service
 
@@ -69,7 +69,7 @@ Requires:         python-paramiko >= 1.13.0
 Requires:         python-paste
 
 Requires:         python-qpid
-Requires:         python-kombu >= 2.5.0
+Requires:         python-kombu >= 3.0.7
 Requires:         python-amqplib
 
 Requires:         python-pbr >= 0.6.0, python-pbr < 0.7.0, python-pbr > 0.7.0, python-pbr < 1.0
@@ -79,22 +79,22 @@ Requires:         python-iso8601 >= 0.1.9
 Requires:         python-lxml >= 2.3
 Requires:         python-netaddr >= 0.7.12
 Requires:         python-oslo-config >= 1:1.4.0
-Requires:         python-oslo-db >= 1.0.0
-Requires:         python-oslo-messaging >= 1.4.0
+Requires:         python-oslo-db >= 1.0.0, python-oslo-db < 1.1
+Requires:         python-oslo-messaging >= 1.4.0, python-oslo-messaging < 1.5.0
 Requires:         python-oslo-rootwrap >= 1.3.0
 Requires:         python-osprofiler >= 0.3.0
 Requires:         python-anyjson >= 0.3.3
 Requires:         python-argparse
 #Requires:         python-cheetah
 Requires:         python-stevedore >= 1.0.0
-Requires:         python-suds >= 0.4
+Requires:         python-suds >= 0.4, python-suds < 0.4.2
 
-Requires:         python-sqlalchemy  >= 0.8.4, python-sqlalchemy <= 0.8.99, python-sqlalchemy >= 0.9.7, python-sqlalchemy <= 0.9.99
-Requires:         python-migrate >= 0.9.1, python-migrate < 0.9.2, python-migrate > 0.9.2
+Requires:         python-sqlalchemy  >= 0.9.7, python-sqlalchemy <= 0.9.99
+Requires:         python-migrate == 0.9.1
 
 Requires:         python-paste-deploy >= 1.5.0
 Requires:         python-crypto >= 2.6
-Requires:         python-barbicanclient >= 2.1.0
+Requires:         python-barbicanclient >= 2.1.0, python-barbicanclient < 3.0.0, python-barbicanclient > 3.0.0, python-barbicanclient < 3.0.2
 Requires:         python-glanceclient >= 1:0.14.0
 Requires:         python-routes >= 1.12.3, python-routes < 2.0, python-routes > 2.0
 Requires:         python-webob >= 1.2.3
@@ -102,8 +102,8 @@ Requires:         python-wsgiref >= 0.1.2
 Requires:         python-oslo-i18n >= 1.0.0
 
 Requires:         python-swiftclient >= 2.2.0
-Requires:         python-requests >= 1.2.1, python-requests < 2.4.0, python-requests > 2.4.0
-Requires:         python-keystonemiddleware >= 1.0.0
+Requires:         python-requests >= 2.1.0, python-requests <= 2.2.1
+Requires:         python-keystonemiddleware >= 1.0.0, python-keystonemiddleware < 1.4.0
 Requires:         python-novaclient >= 1:2.18.0
 
 Requires:         python-six >= 1.7.0
@@ -112,7 +112,7 @@ Requires:         python-babel >= 1.3
 Requires:         python-lockfile
 
 Requires:         python-rtslib-fb >= 2.1.fb39
-Requires:         python-taskflow >= 0.4
+Requires:         python-taskflow >= 0.4, python-taskflow < 0.7.0
 
 Requires:         python-ceph
 #Requires:         iscsi-initiator-utils
@@ -298,6 +298,9 @@ fi
 %endif
 
 %changelog
+* Mon Mar 02 2015 Daniil Trishkin <dtrishkin@mirantis.com> - 2014.2.2
+- Update to upstream 2014.2.2
+
 * Wed Jun 11 2014 Eric Harney <eharney@redhat.com> - 2014.1.1-2
 - Add dependency on iscsi-initiator-utils