[openstack-glance/el6-essex: 1/2] update to stable/essex 2012.1.2
Pádraig Brady
pbrady at fedoraproject.org
Mon Nov 12 14:42:59 UTC 2012
commit 261f88670f3117c31388b4bffac2eb31ab9cf66e
Author: Pádraig Brady <P at draigBrady.com>
Date: Mon Nov 12 13:59:14 2012 +0000
update to stable/essex 2012.1.2
(cherry picked from commit 18aba43469a57f60652f3dbb97aa28abf3e0cdec)
Conflicts:
openstack-glance.spec
.gitignore | 1 +
0001-Bump-version-to-2012.1.3.patch | 31 ++++++++++++++++++++
...-Don-t-access-the-net-while-building-docs.patch | 2 +-
...> 0003-Support-DB-auto-create-suppression.patch | 2 +-
openstack-glance.spec | 24 +++++++++++----
sources | 2 +-
6 files changed, 53 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dc27a92..3771c45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/glance-2011.3.1.tar.gz
/glance-2012.1.tar.gz
/glance-2012.1.1.tar.gz
+/glance-2012.1.2.tar.gz
diff --git a/0001-Bump-version-to-2012.1.3.patch b/0001-Bump-version-to-2012.1.3.patch
new file mode 100644
index 0000000..e12fdf9
--- /dev/null
+++ b/0001-Bump-version-to-2012.1.3.patch
@@ -0,0 +1,31 @@
+From 120fcf4a4ccecf70e1a9e859b2ad64df695a9929 Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc at redhat.com>
+Date: Fri, 10 Aug 2012 06:52:06 +0100
+Subject: [PATCH] Bump version to 2012.1.3
+
+Set version to 2012.1.3, but with final=False
+
+See http://wiki.openstack.org/StableBranchRelease
+
+Change-Id: I2ce631bbe78d338df5ed08106df9e383f227b127
+---
+ glance/version.py | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/glance/version.py b/glance/version.py
+index 00abe4a..274de06 100644
+--- a/glance/version.py
++++ b/glance/version.py
+@@ -21,10 +21,10 @@ except ImportError:
+ 'revision_id': 'LOCALREVISION',
+ 'revno': 0}
+
+-GLANCE_VERSION = ['2012', '1', '2']
++GLANCE_VERSION = ['2012', '1', '3']
+ YEAR, COUNT, REVSISION = GLANCE_VERSION
+
+-FINAL = True # This becomes true at Release Candidate time
++FINAL = False # This becomes true at Release Candidate time
+
+
+ def canonical_version_string():
diff --git a/0001-Don-t-access-the-net-while-building-docs.patch b/0002-Don-t-access-the-net-while-building-docs.patch
similarity index 92%
rename from 0001-Don-t-access-the-net-while-building-docs.patch
rename to 0002-Don-t-access-the-net-while-building-docs.patch
index cd061bc..1951d9a 100644
--- a/0001-Don-t-access-the-net-while-building-docs.patch
+++ b/0002-Don-t-access-the-net-while-building-docs.patch
@@ -1,4 +1,4 @@
-From bceb3da7bb472c2186929fe065770fd9812e3e87 Mon Sep 17 00:00:00 2001
+From d9c185d12021cef968f5bba529b3cb0a3570222b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
Date: Fri, 6 Jan 2012 17:12:54 +0000
Subject: [PATCH] Don't access the net while building docs
diff --git a/0002-Support-DB-auto-create-suppression.patch b/0003-Support-DB-auto-create-suppression.patch
similarity index 99%
rename from 0002-Support-DB-auto-create-suppression.patch
rename to 0003-Support-DB-auto-create-suppression.patch
index db3da1b..e46b91d 100644
--- a/0002-Support-DB-auto-create-suppression.patch
+++ b/0003-Support-DB-auto-create-suppression.patch
@@ -1,4 +1,4 @@
-From 48ae8ec33128cec1a2d4a33f4f5ced6df2d2f6cb Mon Sep 17 00:00:00 2001
+From 589235405cb0b2a633af7d41a6450f1a61e554c9 Mon Sep 17 00:00:00 2001
From: Eoghan Glynn <eglynn at redhat.com>
Date: Fri, 18 May 2012 14:23:41 +0100
Subject: [PATCH] Support DB auto-create suppression.
diff --git a/openstack-glance.spec b/openstack-glance.spec
index c51c140..5474db0 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,12 +1,12 @@
Name: openstack-glance
-Version: 2012.1.1
+Version: 2012.1.2
Release: 1%{?dist}
Summary: OpenStack Image Service
Group: Applications/System
License: ASL 2.0
URL: http://glance.openstack.org
-Source0: http://launchpad.net/glance/essex/2012.1/+download/glance-%{version}.tar.gz
+Source0: http://launchpad.net/glance/essex/%{version}/+download/glance-%{version}.tar.gz
Source1: openstack-glance-api.init
Source100: openstack-glance-api.upstart
Source2: openstack-glance-registry.init
@@ -14,10 +14,11 @@ Source200: openstack-glance-registry.upstart
Source3: openstack-glance.logrotate
#
-# patches_base=2012.1.1
+# patches_base=2012.1.2
#
-Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
-Patch0002: 0002-Support-DB-auto-create-suppression.patch
+#Patch0001: 0001-Bump-version-to-2012.1.3.patch
+Patch0002: 0002-Don-t-access-the-net-while-building-docs.patch
+Patch0003: 0003-Support-DB-auto-create-suppression.patch
# EPEL specific
Patch100: openstack-glance-newdeps.patch
@@ -100,8 +101,9 @@ This package contains documentation files for glance.
%prep
%setup -q -n glance-%{version}
-%patch0001 -p1
+#%patch0001 -p1
%patch0002 -p1
+%patch0003 -p1
%patch100 -p1
%patch101 -p1
@@ -232,6 +234,16 @@ fi
%doc doc/build/html
%changelog
+* Mon Nov 12 2012 Pádraig Brady <P at draigBrady.com> - 2012.1.2-1
+- Update to stable/essex 2012.1.2 including...
+- Support zero-size image creation via the v1 API
+- Allow admins to share images regardless of owner
+- Log sensitive store info, rather than exposing over API
+- Fix the qpid_heartbeat option to avoid connection timeouts
+- Fix image.upload notification to not send stale metadata
+- Include chunk_name in swift debug message
+- Fix scrubber exception when microsecs in DB (PostgreSQL) dates
+
* Mon Jul 9 2012 Pádraig Brady <P at draigBrady.com> - 2012.1.1-1
- Update to stable/essex 2012.1.1
- Remove world readable bit on sensitive config files
diff --git a/sources b/sources
index e736087..2cd2aad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9128d0a063317b50d7b2b275c6f86a2d glance-2012.1.1.tar.gz
+544496fde64a341a4f39e15f4b258093 glance-2012.1.2.tar.gz
More information about the scm-commits
mailing list