[openstack-ceilometer/f20] Update to upstream 2013.2.4

[Nejc Saje]

commit b10186c3897927fd9d48880d5a0cea8985de7ece
Author: Nejc Saje <nsaje at redhat.com>
Date:   Wed Sep 24 04:45:11 2014 -0400

    Update to upstream 2013.2.4

 .gitignore                                         |    1 +
 ...e-don-t-access-the-net-when-building-docs.patch |    2 +-
 0002-remove-token-from-notifier-middleware.patch   |   43 --------------------
 openstack-ceilometer.spec                          |   16 +++----
 sources                                            |    2 +-
 5 files changed, 10 insertions(+), 54 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3e3aff7..7cc8078 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /ceilometer-2013.2.1.tar.gz
 /ceilometer-2013.2.2.tar.gz
 /ceilometer-2013.2.3.tar.gz
+/ceilometer-2013.2.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 20e7dbd..6fc00c2 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 ba3bb18de4719a769b809921dcb87e0e9f441808 Mon Sep 17 00:00:00 2001
+From 5ae4d18e59f831d95b4c620183ad41f5f647fa81 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/openstack-ceilometer.spec b/openstack-ceilometer.spec
index 0661919..851766c 100644
--- a/openstack-ceilometer.spec
+++ b/openstack-ceilometer.spec
@@ -3,8 +3,8 @@
 %global pypi_name ceilometer
 
 Name:             openstack-ceilometer
-Version:          2013.2.3
-Release:          2%{?dist}
+Version:          2013.2.4
+Release:          1%{?dist}
 Summary:          OpenStack measurement collection service
 
 Group:            Applications/System
@@ -14,6 +14,8 @@ Source0:          http://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{vers
 Source1:          %{pypi_name}-dist.conf
 Source2:          %{pypi_name}.logrotate
 
+Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
+
 Source10:         %{name}-api.service
 Source11:         %{name}-collector.service
 Source12:         %{name}-compute.service
@@ -21,12 +23,6 @@ Source13:         %{name}-central.service
 Source14:         %{name}-alarm-notifier.service
 Source15:         %{name}-alarm-evaluator.service
 
-#
-# patches_base=2013.2.3
-#
-Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
-Patch0002: 0002-remove-token-from-notifier-middleware.patch
-
 BuildArch:        noarch
 BuildRequires:    intltool
 BuildRequires:    python-sphinx
@@ -206,7 +202,6 @@ This package contains documentation files for ceilometer.
 %setup -q -n ceilometer-%{version}
 
 %patch0001 -p1
-%patch0002 -p1
 
 find . \( -name .gitignore -o -name .placeholder \) -delete
 
@@ -465,6 +460,9 @@ fi
 
 
 %changelog
+* Wed Sep 24 2014 Nejc Saje <nsaje at redhat.com> 2013.2.4-1
+- Update to upstream 2013.2.4
+
 * Wed Jun 25 2014 Steve Linabery <slinaber at redhat.com> - 2013.2.3-2
 - remove token from notifier middleware, bz#1112949
 
diff --git a/sources b/sources
index d88daed..dd708ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-78f8e48f0cf26995ac979ec2e51c3cd0  ceilometer-2013.2.3.tar.gz
+757dd35f92849d6f168e6fb7ec9d83a7  ceilometer-2013.2.4.tar.gz