[openstack-cinder] Generate patches from master-patches

[Pádraig Brady]

commit a8ced92b1774911952504ae3819e421920faf71a
Author: Pádraig Brady <P at draigBrady.com>
Date:   Sun Apr 7 02:41:44 2013 +0100

    Generate patches from master-patches

 ...e-don-t-access-the-net-when-building-docs.patch |    4 ++--
 ...ecated-assert_unicode-sqlalchemy-attribut.patch |    5 +----
 openstack-cinder.spec                              |    2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)
---
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 852bae3..80d70fd 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 632fb0194715d52f2b03c5b4b8697d4271bd81f7 Mon Sep 17 00:00:00 2001
+From dc92921a7fbecc609248a4e483ba44450a3821e0 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Ensure we don't access the net when building docs
  1 files changed, 0 insertions(+), 1 deletions(-)
 
 diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 7436039..9a5b826 100644
+index 40e564b..01bd3b4 100644
 --- a/doc/source/conf.py
 +++ b/doc/source/conf.py
 @@ -29,7 +29,6 @@ sys.path.insert(0, os.path.abspath('./'))
diff --git a/0002-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch b/0002-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch
index c523daf..3376691 100644
--- a/0002-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch
+++ b/0002-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch
@@ -1,4 +1,4 @@
-From 105cae43c73f5c75bb342fb4c5d20b5c8edee00c Mon Sep 17 00:00:00 2001
+From a7df1178d47dc126636d49b8ac13b4b229f58015 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
@@ -124,6 +124,3 @@ index 4cc1689..5dfbed0 100644
                                   unicode_error=None,
                                   _warn_on_bytestring=False)),
          Column('size', Integer()),
--- 
-1.7.7.6
-
diff --git a/openstack-cinder.spec b/openstack-cinder.spec
index e0623f2..eee84b4 100644
--- a/openstack-cinder.spec
+++ b/openstack-cinder.spec
@@ -20,7 +20,7 @@ Source12:         openstack-cinder-volume.service
 Source20:         cinder-sudoers
 
 #
-# patches_base=grizzly-2
+# patches_base=2013.1
 #
 Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
 Patch0002: 0002-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch