[openstack-glance/el6] update to stable/essex 2012.1.1
Pádraig Brady
pbrady at fedoraproject.org
Mon Jul 9 00:48:58 UTC 2012
commit 81b72ec6b60cc6070231ecc4765f97c2fc92867c
Author: Pádraig Brady <P at draigBrady.com>
Date: Mon Jul 9 00:32:14 2012 +0100
update to stable/essex 2012.1.1
(cherry picked from commit c9409764)
Conflicts:
openstack-glance.spec
.gitignore | 1 +
...-Don-t-access-the-net-while-building-docs.patch | 2 +-
...re-swift-auth-URL-includes-trailing-slash.patch | 37 ----
...> 0002-Support-DB-auto-create-suppression.patch | 10 +-
0002-search-for-logger-in-PATH.patch | 38 ----
0003-Fix-content-type-for-qpid-notifier.patch | 63 -------
0004-Omit-Content-Length-on-chunked-transfer.patch | 183 --------------------
...-Fix-i18n-in-glance.notifier.notify_kombu.patch | 28 ---
openstack-glance.spec | 23 +--
sources | 2 +-
10 files changed, 16 insertions(+), 371 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b95abbc..dc27a92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/glance-2011.3.1~20120117.1063.tar.gz
/glance-2011.3.1.tar.gz
/glance-2012.1.tar.gz
+/glance-2012.1.1.tar.gz
diff --git a/0006-Don-t-access-the-net-while-building-docs.patch b/0001-Don-t-access-the-net-while-building-docs.patch
similarity index 92%
rename from 0006-Don-t-access-the-net-while-building-docs.patch
rename to 0001-Don-t-access-the-net-while-building-docs.patch
index 3b5e7f1..cd061bc 100644
--- a/0006-Don-t-access-the-net-while-building-docs.patch
+++ b/0001-Don-t-access-the-net-while-building-docs.patch
@@ -1,4 +1,4 @@
-From 6a63200908b9efd846c59a0747f10502d4d819fe Mon Sep 17 00:00:00 2001
+From bceb3da7bb472c2186929fe065770fd9812e3e87 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/0007-Support-DB-auto-create-suppression.patch b/0002-Support-DB-auto-create-suppression.patch
similarity index 99%
rename from 0007-Support-DB-auto-create-suppression.patch
rename to 0002-Support-DB-auto-create-suppression.patch
index 5e5080b..db3da1b 100644
--- a/0007-Support-DB-auto-create-suppression.patch
+++ b/0002-Support-DB-auto-create-suppression.patch
@@ -1,4 +1,4 @@
-From d44afa05c270335d6c9812913f35d75669f0886a Mon Sep 17 00:00:00 2001
+From 48ae8ec33128cec1a2d4a33f4f5ced6df2d2f6cb 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.
@@ -261,10 +261,10 @@ index 5260a89..da0c944 100644
def run_sql_cmd(self, sql):
diff --git a/glance/tests/functional/test_bin_glance.py b/glance/tests/functional/test_bin_glance.py
-index a989b58..5393872 100644
+index b8628e4..5c9d2ef 100644
--- a/glance/tests/functional/test_bin_glance.py
+++ b/glance/tests/functional/test_bin_glance.py
-@@ -643,7 +643,6 @@ class TestBinGlance(functional.FunctionalTest):
+@@ -647,7 +647,6 @@ class TestBinGlance(functional.FunctionalTest):
self.stop_servers()
@@ -272,7 +272,7 @@ index a989b58..5393872 100644
def test_add_location_with_checksum(self):
"""
We test the following:
-@@ -675,7 +674,6 @@ class TestBinGlance(functional.FunctionalTest):
+@@ -679,7 +678,6 @@ class TestBinGlance(functional.FunctionalTest):
self.stop_servers()
@@ -280,7 +280,7 @@ index a989b58..5393872 100644
def test_add_location_without_checksum(self):
"""
We test the following:
-@@ -707,7 +705,6 @@ class TestBinGlance(functional.FunctionalTest):
+@@ -711,7 +709,6 @@ class TestBinGlance(functional.FunctionalTest):
self.stop_servers()
diff --git a/openstack-glance.spec b/openstack-glance.spec
index 3456351..76475d2 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,6 +1,6 @@
Name: openstack-glance
-Version: 2012.1
-Release: 10%{?dist}
+Version: 2012.1.1
+Release: 1%{?dist}
Summary: OpenStack Image Service
Group: Applications/System
@@ -14,15 +14,10 @@ Source200: openstack-glance-registry.upstart
Source3: openstack-glance.logrotate
#
-# patches_base=2012.1
+# patches_base=2012.1.1
#
-Patch0001: 0001-Ensure-swift-auth-URL-includes-trailing-slash.patch
-Patch0002: 0002-search-for-logger-in-PATH.patch
-Patch0003: 0003-Fix-content-type-for-qpid-notifier.patch
-Patch0004: 0004-Omit-Content-Length-on-chunked-transfer.patch
-Patch0005: 0005-Fix-i18n-in-glance.notifier.notify_kombu.patch
-Patch0006: 0006-Don-t-access-the-net-while-building-docs.patch
-Patch0007: 0007-Support-DB-auto-create-suppression.patch
+Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
+Patch0002: 0002-Support-DB-auto-create-suppression.patch
# EPEL specific
Patch100: openstack-glance-newdeps.patch
@@ -107,11 +102,6 @@ This package contains documentation files for glance.
%patch0001 -p1
%patch0002 -p1
-%patch0003 -p1
-%patch0004 -p1
-%patch0005 -p1
-%patch0006 -p1
-%patch0007 -p1
%patch100 -p1
%patch101 -p1
@@ -243,6 +233,9 @@ fi
%doc doc/build/html
%changelog
+* Mon Jul 9 2012 Pádraig Brady <P at draigBrady.com> - 2012.1.1-1
+- Update to stable/essex 2012.1.1
+
* Tue May 22 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-10
- Fix an issue with glance-manage db_sync (#823702)
diff --git a/sources b/sources
index 0be26f0..e736087 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-751273bbb1bd0a05a66409e32aa2ba63 glance-2012.1.tar.gz
+9128d0a063317b50d7b2b275c6f86a2d glance-2012.1.1.tar.gz
More information about the scm-commits
mailing list