hguemar pushed to openstack-cinder (f21). "Update to upstream 2014.1.4"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Mar 26 22:33:51 UTC 2015
>From bceb53dbb65b30620a39c0fefaf67f356ccecf5b Mon Sep 17 00:00:00 2001
From: Haikel Guemar <hguemar at fedoraproject.org>
Date: Thu, 26 Mar 2015 23:31:01 +0100
Subject: Update to upstream 2014.1.4
diff --git a/.gitignore b/.gitignore
index 359365c..3c542c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/cinder-2014.1.2.tar.gz
/cinder-2014.1.3.tar.gz
+/cinder-2014.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 88377c4..c8d4360 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 5f7ff97964c883622f5f6ca8d9c20499f8dfea40 Mon Sep 17 00:00:00 2001
+From cad174f40012a6824510332bc5700a06c64fbd9e 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 72c44b1..32f9355 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 34e5d52ef841a5e5834bbdeb7670a21e44530f75 Mon Sep 17 00:00:00 2001
+From 7cddf31d50599f5ad9b92ccbaba68b180cfb4f86 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 7d376b7..d580efc 100644
--- a/0003-Revert-Switch-over-to-oslosphinx.patch
+++ b/0003-Revert-Switch-over-to-oslosphinx.patch
@@ -1,4 +1,4 @@
-From e5d03dd89f6b4c49cb13411e84518fb509fd095e Mon Sep 17 00:00:00 2001
+From b6453924d6c4e928e5687a2a689faf46b02aa85e 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"
@@ -23,12 +23,12 @@ index ac2eadc..238a922 100644
# autodoc generation is a bit aggressive and a nuisance
diff --git a/test-requirements.txt b/test-requirements.txt
-index 56a802a..5dc1882 100644
+index 41ee056..f6fb6fc 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,4 +13,4 @@ sphinx>=1.1.2,<1.1.999
python-subunit>=0.0.18
- testtools>=0.9.34
+ testtools>=0.9.34,!=1.2.0,!=1.4.0
testrepository>=0.0.18
-oslosphinx
+oslo.sphinx
diff --git a/0004-notify-calling-process-we-are-ready-to-serve.patch b/0004-notify-calling-process-we-are-ready-to-serve.patch
index e513872..db4c26a 100644
--- a/0004-notify-calling-process-we-are-ready-to-serve.patch
+++ b/0004-notify-calling-process-we-are-ready-to-serve.patch
@@ -1,4 +1,4 @@
-From 93a42fb261582390add4c8a2ed75e881cdccd695 Mon Sep 17 00:00:00 2001
+From 757101b8bc09ba3d6ea3a1f6a210e7257bb4c3b4 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/0005-Move-notification-point-to-a-better-place.patch b/0005-Move-notification-point-to-a-better-place.patch
index b49d00f..dd0fd38 100644
--- a/0005-Move-notification-point-to-a-better-place.patch
+++ b/0005-Move-notification-point-to-a-better-place.patch
@@ -1,4 +1,4 @@
-From 20ed048df58ee46c4500ad6223cd6411c79b37ec Mon Sep 17 00:00:00 2001
+From 4628b4daac77b4b0753ae59614b6f14aaf493388 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/0006-Merge-Sync-latest-strutils-from-oslo-incubator-for-m.patch b/0006-Merge-Sync-latest-strutils-from-oslo-incubator-for-m.patch
deleted file mode 100644
index 79bbd7a..0000000
--- a/0006-Merge-Sync-latest-strutils-from-oslo-incubator-for-m.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b1c5da1dea6bf424eee9535036830a9c05cb5bae Mon Sep 17 00:00:00 2001
-From: Jenkins <jenkins at review.openstack.org>
-Date: Wed, 22 Oct 2014 13:17:02 +0000
-Subject: [PATCH] Merge "Sync latest strutils from oslo-incubator for
- mask_password fix" into stable/icehouse
-
----
- cinder/openstack/common/strutils.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/cinder/openstack/common/strutils.py b/cinder/openstack/common/strutils.py
-index e3e0b76..381ca3e 100644
---- a/cinder/openstack/common/strutils.py
-+++ b/cinder/openstack/common/strutils.py
-@@ -297,7 +297,12 @@ def mask_password(message, secret="***"):
- >>> mask_password("u'original_password' : u'aaaaa'")
- "u'original_password' : u'***'"
- """
-- message = six.text_type(message)
-+ try:
-+ message = six.text_type(message)
-+ except UnicodeDecodeError:
-+ # NOTE(jecarey): Temporary fix to handle cases where message is a
-+ # byte string. A better solution will be provided in Kilo.
-+ pass
-
- # NOTE(ldbragst): Check to see if anything in message contains any key
- # specified in _SANITIZE_KEYS, if not then just return the message since
diff --git a/openstack-cinder.spec b/openstack-cinder.spec
index 5a034ab..9f1b50b 100644
--- a/openstack-cinder.spec
+++ b/openstack-cinder.spec
@@ -1,8 +1,8 @@
%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
Name: openstack-cinder
-Version: 2014.1.3
-Release: 2%{?dist}
+Version: 2014.1.4
+Release: 1%{?dist}
Summary: OpenStack Volume service
Group: Applications/System
@@ -27,15 +27,11 @@ Source1300: openstack-cinder-backup.upstart
Source20: cinder-sudoers
-#
-# patch_base=2014.1.3
-#
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-notify-calling-process-we-are-ready-to-serve.patch
Patch0005: 0005-Move-notification-point-to-a-better-place.patch
-Patch0006: 0006-Merge-Sync-latest-strutils-from-oslo-incubator-for-m.patch
BuildArch: noarch
BuildRequires: intltool
@@ -164,7 +160,6 @@ This package contains documentation files for cinder.
%patch0003 -p1
%patch0004 -p1
%patch0005 -p1
-%patch0006 -p1
find . \( -name .gitignore -o -name .placeholder \) -delete
@@ -351,6 +346,9 @@ fi
%endif
%changelog
+* Thu Mar 26 2015 Haikel Guemar <hguemar at fedoraproject.org> - 2014.1.4-1
+- Update to upstream 2014.1.4
+
* Tue Nov 18 2014 Haikel Guemar <hguemar at fedoraproject.org> - 2014.1.3-2
- Fix LVM snapshot/volume delete failure (RBHZ #1154534)
diff --git a/sources b/sources
index 0d09fb6..bb90e54 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ac9e423fff77786c2400a15fc11308ec cinder-2014.1.3.tar.gz
+99cef3d8d3131f46c726cf00e050d567 cinder-2014.1.4.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/openstack-cinder.git/commit/?h=f21&id=bceb53dbb65b30620a39c0fefaf67f356ccecf5b
More information about the scm-commits
mailing list