[openstack-cinder/el6-grizzly] Update to 2013.1.4
Eric Harney
eharney at fedoraproject.org
Tue Oct 22 17:09:40 UTC 2013
commit ae6c5c02f11af09be790ca831bc3c3041ce17254
Author: Eric Harney <eharney at redhat.com>
Date: Thu Oct 17 17:40:17 2013 -0400
Update to 2013.1.4
Updated patches from el6-grizzly-patches
.gitignore | 2 ++
...e-don-t-access-the-net-when-building-docs.patch | 6 +++---
...-parallel-install-versions-of-epel-packag.patch | 8 ++++----
...ecated-assert_unicode-sqlalchemy-attribut.patch | 6 +++---
...oid-code-path-causing-qpid-exchange-leaks.patch | 6 +++---
openstack-cinder.spec | 11 +++++++----
sources | 2 +-
7 files changed, 23 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cd069a0..53a8023 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
/cinder-2013.1.2.tar.gz
+/cinder-2013.1.3.tar.gz
+/cinder-2013.1.4.tar.gz
diff --git a/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch b/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
index dedae5b..5b9751b 100644
--- a/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
+++ b/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
@@ -1,12 +1,12 @@
-From 39f22f4c738f8d7b63390fefa4f3ec8c26b2946c Mon Sep 17 00:00:00 2001
+From 8b235eaf9bafcd1dc67dd2cfedb1cb41cbc3ad2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
Date: Fri, 21 Sep 2012 13:33:26 +0100
Subject: [PATCH] Ensure we don't access the net when building docs
(Note, this has not been sent upstream)
---
- doc/source/conf.py | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
+ doc/source/conf.py | 1 -
+ 1 file changed, 1 deletion(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 40e564b..01bd3b4 100644
diff --git a/0002-Use-updated-parallel-install-versions-of-epel-packag.patch b/0002-Use-updated-parallel-install-versions-of-epel-packag.patch
index ce26804..6fb0f13 100644
--- a/0002-Use-updated-parallel-install-versions-of-epel-packag.patch
+++ b/0002-Use-updated-parallel-install-versions-of-epel-packag.patch
@@ -1,4 +1,4 @@
-From 4315f3f120a4689c49bb281dc4e2696811a453fc Mon Sep 17 00:00:00 2001
+From a338adfb3aeac0b54540296a15be0fc15b08a818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
Date: Wed, 24 Oct 2012 13:44:37 +0100
Subject: [PATCH] Use updated parallel install versions of epel package
@@ -15,9 +15,9 @@ system default module versions.
Conflicts:
bin/cinder-manage
---
- bin/cinder-manage | 7 ++++---
- cinder/__init__.py | 30 ++++++++++++++++++++++++++++++
- cinder/db/sqlalchemy/migration.py | 7 ++++++-
+ bin/cinder-manage | 7 ++++---
+ cinder/__init__.py | 30 ++++++++++++++++++++++++++++++
+ cinder/db/sqlalchemy/migration.py | 7 ++++++-
3 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/bin/cinder-manage b/bin/cinder-manage
diff --git a/0003-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch b/0003-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch
index 8b53d68..a1255ae 100644
--- a/0003-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch
+++ b/0003-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch
@@ -1,4 +1,4 @@
-From 5f859e279bb70be1a39a3375048f04387c4714ea Mon Sep 17 00:00:00 2001
+From 124be6dbce108dda1a86327da495d418faf9642a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
Date: Tue, 2 Apr 2013 14:44:51 +0100
Subject: [PATCH] remove deprecated assert_unicode sqlalchemy attribute
@@ -9,8 +9,8 @@ http://docs.sqlalchemy.org/en/latest/changelog/changelog_08.html#change-ad44af79
Change-Id: I305bfdbcd3c3669c41318ea34115624f729b3909
---
- .../migrate_repo/versions/002_quota_class.py | 11 ++++-------
- .../migrate_repo/versions/008_add_backup.py | 11 -----------
+ cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py | 11 ++++-------
+ cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py | 11 -----------
2 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py b/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py
diff --git a/0004-avoid-code-path-causing-qpid-exchange-leaks.patch b/0004-avoid-code-path-causing-qpid-exchange-leaks.patch
index 7cc7b38..c240bae 100644
--- a/0004-avoid-code-path-causing-qpid-exchange-leaks.patch
+++ b/0004-avoid-code-path-causing-qpid-exchange-leaks.patch
@@ -1,4 +1,4 @@
-From 6de0423caf6aba844d472df1f45e68f7df803440 Mon Sep 17 00:00:00 2001
+From d1ac1f055ed45617a7de5f2f3314216d01b3d7d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
Date: Wed, 17 Jul 2013 16:03:44 +0100
Subject: [PATCH] avoid code path causing qpid exchange leaks
@@ -7,8 +7,8 @@ Always assume amqp_rpc_single_reply_queue is True,
so that the problematic code path is ignored.
The issue is discussed at https://pad.lv/1178375
---
- cinder/openstack/common/rpc/amqp.py | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ cinder/openstack/common/rpc/amqp.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/cinder/openstack/common/rpc/amqp.py b/cinder/openstack/common/rpc/amqp.py
index 832511c..fd621c4 100644
diff --git a/openstack-cinder.spec b/openstack-cinder.spec
index f0d7736..3484d63 100644
--- a/openstack-cinder.spec
+++ b/openstack-cinder.spec
@@ -1,7 +1,7 @@
%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
Name: openstack-cinder
-Version: 2013.1.3
+Version: 2013.1.4
Release: 1%{?dist}
Summary: OpenStack Volume service
@@ -23,7 +23,7 @@ Source120: openstack-cinder-volume.upstart
Source20: cinder-sudoers
#
-# patches_base=2013.1.3
+# patches_base=2013.1.4
#
Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
Patch0002: 0002-Use-updated-parallel-install-versions-of-epel-packag.patch
@@ -290,6 +290,9 @@ fi
%endif
%changelog
+* Thu Oct 17 2013 Eric Harney <eharney at redhat.com> - 2013.1.4-1
+- Update to Grizzly stable release 4
+
* Thu Aug 29 2013 Pádraig Brady <pbrady at redhat.com> - 2013.1.3-1
- Update to Grizzly stable release 3
- Add dependency on sysfsutils to support the fiber channel driver
@@ -303,7 +306,7 @@ fi
* Wed Jul 17 2013 Pádraig Brady <pbrady at redhat.com> - 2013.1.2-2
- Avoid qpid exchange leaks
-* Mon Jun 20 2013 Eric Harney <eharney at redhat.com> - 2013.1.2-1
+* Thu Jun 20 2013 Eric Harney <eharney at redhat.com> - 2013.1.2-1
- Update to Grizzly stable release 2
* Fri May 10 2013 Eric Harney <eharney at redhat.com> - 2013.1.1-1
@@ -316,7 +319,7 @@ fi
* Thu Apr 04 2013 Eric Harney <eharney at redhat.com> - 2013.1-1
- Update to Grizzly final release
-* Mon Mar 27 2013 Eric Harney <eharney at redhat.com> - 2013.1-0.5.rc3
+* Wed Mar 27 2013 Eric Harney <eharney at redhat.com> - 2013.1-0.5.rc3
- Update to Grizzly RC3 release
* Mon Mar 25 2013 Eric Harney <eharney at redhat.com> - 2013.1-0.5.rc2
diff --git a/sources b/sources
index 29f422c..1c93d39 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2bfeacfaea7be5194587bb932dd8f693 cinder-2013.1.3.tar.gz
+1ff6248e9064c72f6f4563d0a8c6d2eb cinder-2013.1.4.tar.gz
More information about the scm-commits
mailing list