[openstack-cinder/el6-icehouse] Update to 2014.1.1
Eric Harney
eharney at fedoraproject.org
Thu Jul 3 16:34:09 UTC 2014
commit e2dfb697a665522981b3fd37944541c0409b954e
Author: Eric Harney <eharney at redhat.com>
Date: Thu Jul 3 12:16:23 2014 -0400
Update to 2014.1.1
Updated patches from el6-icehouse-patches
...e-don-t-access-the-net-when-building-docs.patch | 2 +-
...ve-runtime-dep-on-python-pbr-python-d2to1.patch | 2 +-
0003-Revert-Switch-over-to-oslosphinx.patch | 2 +-
...-parallel-install-versions-of-epel-packag.patch | 2 +-
...elete-active-snapshot-file-on-volume-dele.patch | 148 --------------------
...ify-calling-process-we-are-ready-to-serve.patch | 2 +-
...Move-notification-point-to-a-better-place.patch | 2 +-
...retyping-volume-that-has-volume-type-None.patch | 2 +-
openstack-cinder.spec | 19 ++--
sources | 2 +-
10 files changed, 18 insertions(+), 165 deletions(-)
---
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 c25d3ec..f4cfd0e 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,4 +1,4 @@
-From 75da365f0511c88d215cfde683b18bce744fe060 Mon Sep 17 00:00:00 2001
+From cb906e94369d816c5650baf2ee8c009744205145 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
diff --git a/0002-Remove-runtime-dep-on-python-pbr-python-d2to1.patch b/0002-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
index 009395b..0227da9 100644
--- a/0002-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
+++ b/0002-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
@@ -1,4 +1,4 @@
-From 08f30113561d1e8e855a8837d0a63235aceadd06 Mon Sep 17 00:00:00 2001
+From e65e6db20c4c3e39c7d1a0eea2d88385346f32e1 Mon Sep 17 00:00:00 2001
From: Eric Harney <eharney at redhat.com>
Date: Thu, 13 Jun 2013 17:50:12 -0400
Subject: [PATCH] Remove runtime dep on python-pbr, python-d2to1
diff --git a/0003-Revert-Switch-over-to-oslosphinx.patch b/0003-Revert-Switch-over-to-oslosphinx.patch
index 0997698..e6cfb34 100644
--- a/0003-Revert-Switch-over-to-oslosphinx.patch
+++ b/0003-Revert-Switch-over-to-oslosphinx.patch
@@ -1,4 +1,4 @@
-From e8f8f0ae7facdaaa6176b2f791b7f5a0d038584b Mon Sep 17 00:00:00 2001
+From d64c0e94500aad6e2a12fd542f94c7e2de156eb4 Mon Sep 17 00:00:00 2001
From: Eric Harney <eharney at redhat.com>
Date: Tue, 15 Apr 2014 11:53:46 -0400
Subject: [PATCH] Revert "Switch over to oslosphinx"
diff --git a/0004-Use-updated-parallel-install-versions-of-epel-packag.patch b/0004-Use-updated-parallel-install-versions-of-epel-packag.patch
index 00f6c5f..52b43a7 100644
--- a/0004-Use-updated-parallel-install-versions-of-epel-packag.patch
+++ b/0004-Use-updated-parallel-install-versions-of-epel-packag.patch
@@ -1,4 +1,4 @@
-From 9633a297c25e88d34c2356807e35791fac9f197d Mon Sep 17 00:00:00 2001
+From def75c3f786603d786a89e2efeda8cbde47f4c36 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
diff --git a/0006-notify-calling-process-we-are-ready-to-serve.patch b/0005-notify-calling-process-we-are-ready-to-serve.patch
similarity index 98%
rename from 0006-notify-calling-process-we-are-ready-to-serve.patch
rename to 0005-notify-calling-process-we-are-ready-to-serve.patch
index 8a69c42..df15762 100644
--- a/0006-notify-calling-process-we-are-ready-to-serve.patch
+++ b/0005-notify-calling-process-we-are-ready-to-serve.patch
@@ -1,4 +1,4 @@
-From 27c835a06c4e0de0851d276f16a7734209ca984e Mon Sep 17 00:00:00 2001
+From c1ce004568abbaff416ce65204f5de18091b847a Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at redhat.com>
Date: Tue, 11 Feb 2014 22:36:00 +0100
Subject: [PATCH] notify calling process we are ready to serve
diff --git a/0007-Move-notification-point-to-a-better-place.patch b/0006-Move-notification-point-to-a-better-place.patch
similarity index 96%
rename from 0007-Move-notification-point-to-a-better-place.patch
rename to 0006-Move-notification-point-to-a-better-place.patch
index a283b89..92698d2 100644
--- a/0007-Move-notification-point-to-a-better-place.patch
+++ b/0006-Move-notification-point-to-a-better-place.patch
@@ -1,4 +1,4 @@
-From 88efbcff46769b145c658ab0d7116559a7d25f9f Mon Sep 17 00:00:00 2001
+From d7f8d3cb701eee196fe296e721e5ce5e78165d5c Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at redhat.com>
Date: Mon, 14 Apr 2014 18:11:04 +0200
Subject: [PATCH] Move notification point to a better place
diff --git a/0008-Fix-retyping-volume-that-has-volume-type-None.patch b/0007-Fix-retyping-volume-that-has-volume-type-None.patch
similarity index 98%
rename from 0008-Fix-retyping-volume-that-has-volume-type-None.patch
rename to 0007-Fix-retyping-volume-that-has-volume-type-None.patch
index b435b9b..0e0367f 100644
--- a/0008-Fix-retyping-volume-that-has-volume-type-None.patch
+++ b/0007-Fix-retyping-volume-that-has-volume-type-None.patch
@@ -1,4 +1,4 @@
-From 35faa155c098b5721443e54a2dc47867259ffc48 Mon Sep 17 00:00:00 2001
+From 76f6dd8b35d9da78bdfc9a32f09168d57fd444e4 Mon Sep 17 00:00:00 2001
From: git-harry <git-harry at live.co.uk>
Date: Thu, 8 May 2014 12:38:41 +0100
Subject: [PATCH] Fix retyping volume that has volume type None
diff --git a/openstack-cinder.spec b/openstack-cinder.spec
index 0e0fade..6db7df6 100644
--- a/openstack-cinder.spec
+++ b/openstack-cinder.spec
@@ -1,14 +1,14 @@
%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
Name: openstack-cinder
-Version: 2014.1
-Release: 4%{?dist}
+Version: 2014.1.1
+Release: 1%{?dist}
Summary: OpenStack Volume service
Group: Applications/System
License: ASL 2.0
URL: http://www.openstack.org/software/openstack-storage/
-Source0: https://launchpad.net/cinder/icehouse/2014.1/+download/cinder-%{version}.tar.gz
+Source0: https://launchpad.net/cinder/icehouse/2014.1.1/+download/cinder-%{version}.tar.gz
Source1: cinder-dist.conf
Source2: cinder.logrotate
Source3: cinder-tgt.conf
@@ -25,16 +25,15 @@ Source130: openstack-cinder-backup.upstart
Source20: cinder-sudoers
#
-# patches_base=2014.1
+# patches_base=2014.1.1
#
Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
Patch0002: 0002-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
Patch0003: 0003-Revert-Switch-over-to-oslosphinx.patch
Patch0004: 0004-Use-updated-parallel-install-versions-of-epel-packag.patch
-Patch0005: 0005-GlusterFS-Delete-active-snapshot-file-on-volume-dele.patch
-Patch0006: 0006-notify-calling-process-we-are-ready-to-serve.patch
-Patch0007: 0007-Move-notification-point-to-a-better-place.patch
-Patch0008: 0008-Fix-retyping-volume-that-has-volume-type-None.patch
+Patch0005: 0005-notify-calling-process-we-are-ready-to-serve.patch
+Patch0006: 0006-Move-notification-point-to-a-better-place.patch
+Patch0007: 0007-Fix-retyping-volume-that-has-volume-type-None.patch
BuildArch: noarch
BuildRequires: intltool
@@ -157,7 +156,6 @@ This package contains documentation files for cinder.
%patch0005 -p1
%patch0006 -p1
%patch0007 -p1
-%patch0008 -p1
find . \( -name .gitignore -o -name .placeholder \) -delete
@@ -312,6 +310,9 @@ fi
%endif
%changelog
+* Thu Jul 03 2014 Eric Harney <eharney at redhat.com> - 2014.1.1-1
+- Update to Icehouse stable release 1
+
* Tue Jun 17 2014 Eric Harney <eharney at redhat.com> - 2014.1-4
- Fix retype for volume with type None
diff --git a/sources b/sources
index 6dc60f8..b7676d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf604f94a3c6309c3a6c68c50abf7f0e cinder-2014.1.tar.gz
+385f6e60f4ab468dcdf8154eb2b42613 cinder-2014.1.1.tar.gz
More information about the scm-commits
mailing list