[openstack-cinder/f19] Update to 2013.1.4

[Eric Harney]

commit 68eb98310df791293180e7c8ee2720b209df4a1c
Author: Eric Harney <eharney at redhat.com>
Date:   Thu Oct 17 17:40:17 2013 -0400

    Update to 2013.1.4
    
    Updated patches from f19-patches

 .gitignore                                         |    1 +
 ...e-don-t-access-the-net-when-building-docs.patch |    6 +++---
 ...ecated-assert_unicode-sqlalchemy-attribut.patch |    6 +++---
 ...oid-code-path-causing-qpid-exchange-leaks.patch |    6 +++---
 openstack-cinder.spec                              |    9 ++++++---
 sources                                            |    2 +-
 6 files changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e106743..53a8023 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /cinder-2013.1.2.tar.gz
 /cinder-2013.1.3.tar.gz
+/cinder-2013.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 d7e8fe1..d5a5088 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,12 +1,12 @@
-From b43a5400b17a54d097c2b5f0d34534f26d9ed8a2 Mon Sep 17 00:00:00 2001
+From 5cad05e1cf8a5ae3f6d0ed4e388c1e4d82bb6e15 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
 
 (Note, this has not been sent upstream)
 ---
- doc/source/conf.py |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
+ doc/source/conf.py | 1 -
+ 1 file changed, 1 deletion(-)
 
 diff --git a/doc/source/conf.py b/doc/source/conf.py
 index 40e564b..01bd3b4 100644
diff --git a/0002-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch b/0002-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch
index 34f21ee..3a2f20b 100644
--- a/0002-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch
+++ b/0002-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch
@@ -1,4 +1,4 @@
-From a8400f88720d7f9dc39e2eb345526fa3d9c94bc5 Mon Sep 17 00:00:00 2001
+From 0d7042e7ca751d592234bed31793bc9a5d18363e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
 Date: Tue, 2 Apr 2013 14:44:51 +0100
 Subject: [PATCH] remove deprecated assert_unicode sqlalchemy attribute
@@ -9,8 +9,8 @@ http://docs.sqlalchemy.org/en/latest/changelog/changelog_08.html#change-ad44af79
 
 Change-Id: I305bfdbcd3c3669c41318ea34115624f729b3909
 ---
- .../migrate_repo/versions/002_quota_class.py       |   11 ++++-------
- .../migrate_repo/versions/008_add_backup.py        |   11 -----------
+ cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py | 11 ++++-------
+ cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py  | 11 -----------
  2 files changed, 4 insertions(+), 18 deletions(-)
 
 diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py b/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py
diff --git a/0003-avoid-code-path-causing-qpid-exchange-leaks.patch b/0003-avoid-code-path-causing-qpid-exchange-leaks.patch
index e566705..517ac33 100644
--- a/0003-avoid-code-path-causing-qpid-exchange-leaks.patch
+++ b/0003-avoid-code-path-causing-qpid-exchange-leaks.patch
@@ -1,4 +1,4 @@
-From 736ad4f1b78b4ff56882247058cbc9862942f338 Mon Sep 17 00:00:00 2001
+From 116aa7720e527bfa5d3f55ad692fe583d68c4d05 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
 Date: Wed, 17 Jul 2013 16:03:44 +0100
 Subject: [PATCH] avoid code path causing qpid exchange leaks
@@ -7,8 +7,8 @@ Always assume amqp_rpc_single_reply_queue is True,
 so that the problematic code path is ignored.
 The issue is discussed at https://pad.lv/1178375
 ---
- cinder/openstack/common/rpc/amqp.py |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ cinder/openstack/common/rpc/amqp.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/cinder/openstack/common/rpc/amqp.py b/cinder/openstack/common/rpc/amqp.py
 index 832511c..fd621c4 100644
diff --git a/openstack-cinder.spec b/openstack-cinder.spec
index f068bb5..49191fb 100644
--- a/openstack-cinder.spec
+++ b/openstack-cinder.spec
@@ -1,7 +1,7 @@
 %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
 
 Name:             openstack-cinder
-Version:          2013.1.3
+Version:          2013.1.4
 Release:          1%{?dist}
 Summary:          OpenStack Volume service
 
@@ -20,7 +20,7 @@ Source12:         openstack-cinder-volume.service
 Source20:         cinder-sudoers
 
 #
-# patches_base=2013.1.3
+# patches_base=2013.1.4
 #
 Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
 Patch0002: 0002-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch
@@ -274,6 +274,9 @@ fi
 %endif
 
 %changelog
+* Thu Oct 17 2013 Eric Harney <eharney at redhat.com> - 2013.1.4-1
+- Update to Grizzly stable release 4
+
 * Thu Aug 29 2013 Pádraig Brady <pbrady at redhat.com> - 2013.1.3-1
 - Update to Grizzly stable release 3
 - Add dependency on sysfsutils to support the fiber channel driver
@@ -287,7 +290,7 @@ fi
 * Wed Jul 17 2013 Pádraig Brady <pbrady at redhat.com> - 2013.1.2-2
 - Avoid qpid exchange leaks
 
-* Mon Jun 20 2013 Eric Harney <eharney at redhat.com> - 2013.1.2-1
+* Thu Jun 20 2013 Eric Harney <eharney at redhat.com> - 2013.1.2-1
 - Update to Grizzly stable release 2
 
 * Mon May 13 2013 Eric Harney <eharney at redhat.com> - 2013.1.1-1
diff --git a/sources b/sources
index 29f422c..1c93d39 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2bfeacfaea7be5194587bb932dd8f693  cinder-2013.1.3.tar.gz
+1ff6248e9064c72f6f4563d0a8c6d2eb  cinder-2013.1.4.tar.gz