[openstack-cinder] Update to Havana rc2

Eric Harney eharney at fedoraproject.org
Tue Oct 15 16:11:50 UTC 2013


commit 855869f4d0c527f321c735176bbabc0caabbf2fc
Author: Eric Harney <eharney at redhat.com>
Date:   Fri Oct 11 16:13:18 2013 -0400

    Update to Havana rc2
    
    Updated patches from master-patches

 .gitignore                                         |    2 +-
 ...e-don-t-access-the-net-when-building-docs.patch |    2 +-
 ...ve-runtime-dep-on-python-pbr-python-d2to1.patch |    2 +-
 ...oslo.sphinx-and-remove-local-copy-of-doc-.patch |    2 +-
 openstack-cinder.spec                              |   11 +++++++----
 sources                                            |    2 +-
 6 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6c6147d..7b6291c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/cinder-2013.2.rc1.tar.gz
+/cinder-2013.2.rc2.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 88d16dc..5ae3ce0 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 c617721f7fb025284f8dbaededcfb6bcb4610fa4 Mon Sep 17 00:00:00 2001
+From 93370dddaf2edd9dbd601697677707cc50486681 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 935278a..718610f 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 6fe826d58987a8b2d12a87857191fa55977bd692 Mon Sep 17 00:00:00 2001
+From be07304488ce384c12def0839630f927eeb7da40 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-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch b/0003-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
index 77bee87..49815a2 100644
--- a/0003-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
+++ b/0003-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
@@ -1,4 +1,4 @@
-From 84cc2c3f649690210c9661269427fe309fbf312f Mon Sep 17 00:00:00 2001
+From 4b3fd34b0faf2a574d43cdccfd9edf126313f021 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
 Date: Mon, 22 Jul 2013 03:10:04 +0100
 Subject: [PATCH] Revert "Use oslo.sphinx and remove local copy of doc theme"
diff --git a/openstack-cinder.spec b/openstack-cinder.spec
index aa98ab0..8780da7 100644
--- a/openstack-cinder.spec
+++ b/openstack-cinder.spec
@@ -2,13 +2,13 @@
 
 Name:             openstack-cinder
 Version:          2013.2
-Release:          0.11.rc1%{?dist}
+Release:          0.12.rc2%{?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/havana/havana-rc1/+download/cinder-%{version}.rc1.tar.gz
+Source0:          https://launchpad.net/cinder/havana/havana-rc2/+download/cinder-%{version}.rc2.tar.gz
 Source1:          cinder-dist.conf
 Source2:          cinder.logrotate
 Source3:          cinder-tgt.conf
@@ -21,7 +21,7 @@ Source13:         openstack-cinder-backup.service
 Source20:         cinder-sudoers
 
 #
-# patches_base=2013.2.rc1
+# patches_base=2013.2.rc2
 #
 Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
 Patch0002: 0002-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
@@ -132,7 +132,7 @@ This package contains documentation files for cinder.
 %endif
 
 %prep
-%setup -q -n cinder-%{version}.rc1
+%setup -q -n cinder-%{version}.rc2
 
 %patch0001 -p1
 %patch0002 -p1
@@ -295,6 +295,9 @@ fi
 %endif
 
 %changelog
+* Fri Oct 11 2013 Eric Harney <eharney at redhat.com> - 2013.2-0.12.rc2
+- Update to Havana RC2
+
 * Tue Oct 08 2013 Eric Harney <eharney at redhat.com> - 2013.2-0.11.rc1
 - Update to Havana RC1
 - Fix python-novaclient req epoch
diff --git a/sources b/sources
index ad1b473..fa6b569 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-908284e0055a5458c8a7328d852e1614  cinder-2013.2.rc1.tar.gz
+f0e31652d5deeb73d0560dd52c12ffdd  cinder-2013.2.rc2.tar.gz


More information about the scm-commits mailing list