[openstack-nova/f19] Update to stable/grizzly 2013.1.4

[Xavier Queralt Mateu]

commit ebd61114c425b035cb13d9ee5710fe80c91493fc
Author: Xavier Queralt <xqueralt at redhat.com>
Date:   Wed Oct 23 12:19:49 2013 +0200

    Update to stable/grizzly 2013.1.4

 .gitignore                                         |   20 +--
 ...e-don-t-access-the-net-when-building-docs.patch |    2 +-
 ...oid-code-path-causing-qpid-exchange-leaks.patch |    2 +-
 ...nforce-flavor-access-during-instance-boot.patch |   85 ------
 0004-Update-rpc-impl_qpid.py-from-oslo.patch       |  299 --------------------
 openstack-nova.spec                                |   15 +-
 sources                                            |    2 +-
 7 files changed, 11 insertions(+), 414 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fe61573..e22222a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1 @@
-/nova-2011.3.1~20120117.10818.tar.gz
-/nova-2011.3.1.tar.gz
-/nova-2012.1~e3.tar.gz
-/nova-2012.1~e4.tar.gz
-/nova-2012.1~rc1.tar.gz
-/nova-2012.1.tar.gz
-/nova-2012.2~f1.tar.gz
-/nova-2012.2~f3.tar.gz
-/nova-2012.2~rc1.tar.gz
-/nova-2012.2.tar.gz
-/nova-2013.1~g1.tar.gz
-/nova-2013.1~g2.tar.gz
-/nova-2013.1.g3.tar.gz
-/nova-2013.1.rc1.tar.gz
-/nova-2013.1.rc2.tar.gz
-/nova-2013.1.tar.gz
-/nova-2013.1.1.tar.gz
-/nova-2013.1.2.tar.gz
-/nova-2013.1.3.tar.gz
+/nova-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 2267969..2ac4b38 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 017d129a4428cc5ce93cc318322b606ba3ac7565 Mon Sep 17 00:00:00 2001
+From d5f80b1fed505beb4d721ca8c421bc7f052a12b3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
 Date: Fri, 6 Jan 2012 12:16:34 +0000
 Subject: [PATCH] Ensure we don't access the net when building docs
diff --git a/0002-avoid-code-path-causing-qpid-exchange-leaks.patch b/0002-avoid-code-path-causing-qpid-exchange-leaks.patch
index f68355e..f674b14 100644
--- a/0002-avoid-code-path-causing-qpid-exchange-leaks.patch
+++ b/0002-avoid-code-path-causing-qpid-exchange-leaks.patch
@@ -1,4 +1,4 @@
-From af4ce95543d599b83905817e11ddc977cae4c7ae Mon Sep 17 00:00:00 2001
+From 6f11da70b5b55594987f72d5e5df261547e1e07b Mon Sep 17 00:00:00 2001
 From: Nikola Dipanov <ndipanov at redhat.com>
 Date: Wed, 17 Jul 2013 18:19:14 +0200
 Subject: [PATCH] avoid code path causing qpid exchange leaks
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 3d29bdf..fb53e9d 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -1,14 +1,14 @@
 %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
 
 Name:             openstack-nova
-Version:          2013.1.3
-Release:          3%{?dist}
+Version:          2013.1.4
+Release:          1%{?dist}
 Summary:          OpenStack Compute (nova)
 
 Group:            Applications/System
 License:          ASL 2.0
 URL:              http://openstack.org/projects/compute/
-Source0:          https://launchpad.net/nova/grizzly/2013.1/+download/nova-%{version}.tar.gz
+Source0:          https://launchpad.net/nova/grizzly/%{version}/+download/nova-%{version}.tar.gz
 
 Source1:          nova.conf
 Source6:          nova.logrotate
@@ -35,12 +35,10 @@ Source24:         nova-sudoers
 Source30:         openstack-nova-novncproxy.sysconfig
 
 #
-# 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-avoid-code-path-causing-qpid-exchange-leaks.patch
-Patch0003: 0003-Enforce-flavor-access-during-instance-boot.patch
-Patch0004: 0004-Update-rpc-impl_qpid.py-from-oslo.patch
 
 BuildArch:        noarch
 BuildRequires:    intltool
@@ -389,8 +387,6 @@ This package contains documentation files for nova.
 
 %patch0001 -p1
 %patch0002 -p1
-%patch0003 -p1
-%patch0004 -p1
 
 find . \( -name .gitignore -o -name .placeholder \) -delete
 
@@ -845,6 +841,9 @@ fi
 %endif
 
 %changelog
+* Wed Oct 23 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.1.4-1
+- Update to stable/grizzly 2013.1.4 release
+
 * Thu Sep 12 2013 Pádraig Brady <pbrady at redhat.com> - 2013.1.3-3
 - Depend on genisoimage to support creating guest config drives
 
diff --git a/sources b/sources
index 2949d46..d2a7259 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6215982b9ed08b9042e088470d60a0a6  nova-2013.1.3.tar.gz
+01828581db0d65d2019816d0cdb3c2a2  nova-2013.1.4.tar.gz