[openstack-cinder/f20] Update to Havana stable release 1

[Eric Harney]

commit a47e6e7e99b0afa9308b27f35221bd601e535efa
Author: Eric Harney <eharney at redhat.com>
Date:   Mon Dec 16 15:45:54 2013 -0500

    Update to Havana stable release 1
    
    Updated patches from f20-patches

 .gitignore                                         |    1 +
 ...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 |    6 +-
 ...-set-correct-filename-when-cloning-volume.patch |   64 -------------
 ...ynchronize-operations-that-manipulate-qco.patch |   95 --------------------
 openstack-cinder.spec                              |   13 ++--
 sources                                            |    2 +-
 8 files changed, 13 insertions(+), 172 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b893f55..d64bfbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /cinder-2013.2.tar.gz
+/cinder-2013.2.1.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 888c0e1..b0c2a8f 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 33151b294b3447da6cb0d8b2d4c5b8b3d85da5cc Mon Sep 17 00:00:00 2001
+From 75c587db5cc356a0aef71908e61b25fbb924a54a 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 5ddc3a8..bfd7290 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 bf26f142db507f401290f99eb20829abc9b1930b Mon Sep 17 00:00:00 2001
+From f88ad295e1545334fc90eadb8239447121a598b5 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 c99755e..a4ca589 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 5109fb1f45b454d177d7db4752c0fe3ca959b936 Mon Sep 17 00:00:00 2001
+From a59ad83381bf090112aa5be8ffa3a1cf3b778117 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"
@@ -1227,10 +1227,10 @@ index 238a922..58fc367 100644
  # Theme options are theme-specific and customize the look and feel of a theme
  # further.  For a list of options available for each theme, see the
 diff --git a/test-requirements.txt b/test-requirements.txt
-index 35f6c82..895a523 100644
+index 6159c98..9d2efbb 100644
 --- a/test-requirements.txt
 +++ b/test-requirements.txt
-@@ -12,4 +12,3 @@ sphinx>=1.1.2
+@@ -12,4 +12,3 @@ sphinx>=1.1.2,<1.2
  python-subunit
  testtools>=0.9.32
  testrepository>=0.0.17
diff --git a/openstack-cinder.spec b/openstack-cinder.spec
index 9bb0031..8db1922 100644
--- a/openstack-cinder.spec
+++ b/openstack-cinder.spec
@@ -1,8 +1,8 @@
 %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
 
 Name:             openstack-cinder
-Version:          2013.2
-Release:          3%{?dist}
+Version:          2013.2.1
+Release:          1%{?dist}
 Summary:          OpenStack Volume service
 
 Group:            Applications/System
@@ -21,13 +21,11 @@ Source13:         openstack-cinder-backup.service
 Source20:         cinder-sudoers
 
 #
-# patches_base=2013.2
+# patches_base=2013.2.1
 #
 Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
 Patch0002: 0002-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
 Patch0003: 0003-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
-Patch0004: 0004-GlusterFS-set-correct-filename-when-cloning-volume.patch
-Patch0005: 0005-GlusterFS-Synchronize-operations-that-manipulate-qco.patch
 
 BuildArch:        noarch
 BuildRequires:    intltool
@@ -139,8 +137,6 @@ This package contains documentation files for cinder.
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
-%patch0004 -p1
-%patch0005 -p1
 
 find . \( -name .gitignore -o -name .placeholder \) -delete
 
@@ -299,6 +295,9 @@ fi
 %endif
 
 %changelog
+* Tue Dec 17 2013 Eric Harney <eharney at redhat.com> - 2013.2.1-1
+- Update to Havana stable release 1
+
 * Mon Nov 25 2013 Eric Harney <eharney at redhat.com> - 2013.2-3
 - Synchronize GlusterFS volume operations
 
diff --git a/sources b/sources
index 2ba3981..1154ada 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ab2aa0e29454fc5088638705e8dcf152  cinder-2013.2.tar.gz
+3a9c82bcab8e94cbc5f8b2ac3ab858e4  cinder-2013.2.1.tar.gz