[openstack-ceilometer/el6-icehouse] Update to upstream 2014.1.1

[slinabery]

commit f6d099cd929b26e87ddc8dfdf26ce60762b2a50b
Author: Steve Linabery <slinaber at redhat.com>
Date:   Wed Jun 11 15:30:28 2014 -0500

    Update to upstream 2014.1.1
    
    Conflicts:
    	openstack-ceilometer.spec

 .gitignore                                         |    1 +
 ...ing-key-is-specified-in-the-address-for-a.patch |   36 ++++++++++++++++++++
 ...e-don-t-access-the-net-when-building-docs.patch |   22 ------------
 openstack-ceilometer.spec                          |   14 +++++--
 sources                                            |    2 +-
 5 files changed, 48 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9d93a7c..97d435d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /ceilometer-2014.1.rc1.tar.gz
 /ceilometer-2014.1.rc2.tar.gz
 /ceilometer-2014.1.tar.gz
+/ceilometer-2014.1.1.tar.gz
diff --git a/0001-Ensure-routing-key-is-specified-in-the-address-for-a.patch b/0001-Ensure-routing-key-is-specified-in-the-address-for-a.patch
new file mode 100644
index 0000000..59dc268
--- /dev/null
+++ b/0001-Ensure-routing-key-is-specified-in-the-address-for-a.patch
@@ -0,0 +1,36 @@
+From 81d2cd61980f39ef952bc715d4dec4d3a1d7efd1 Mon Sep 17 00:00:00 2001
+From: Russell Bryant <rbryant at redhat.com>
+Date: Mon, 9 Jun 2014 17:02:12 -0400
+Subject: [PATCH] Ensure routing key is specified in the address for a direct
+ producer
+
+This change is already merged in oslo-incubator.  Note that for
+Ceilometer this is an Icehouse-specific patch since master has already
+been updated to use the oslo.messaging library.
+
+Original commit message body includes:
+
+    Porting this fix from oslo.messaging.  This fixes the impl_qpid.py
+    driver to allow it to work with the latest stable upstream QPID broker
+    (version 0.28).  See the Apache Qpid Jira bug
+    https://issues.apache.org/jira/browse/QPID-5557
+
+Change-Id: If71f78e50f8a9b3acfd1e9d02c8271f17c4ebee7
+Related-Bug: #1300318
+---
+ ceilometer/openstack/common/rpc/impl_qpid.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ceilometer/openstack/common/rpc/impl_qpid.py b/ceilometer/openstack/common/rpc/impl_qpid.py
+index 7ba2240..e878b90 100644
+--- a/ceilometer/openstack/common/rpc/impl_qpid.py
++++ b/ceilometer/openstack/common/rpc/impl_qpid.py
+@@ -368,7 +368,7 @@ class DirectPublisher(Publisher):
+         """Init a 'direct' publisher."""
+ 
+         if conf.qpid_topology_version == 1:
+-            node_name = msg_id
++            node_name = "%s/%s" % (msg_id, msg_id)
+             node_opts = {"type": "direct"}
+         elif conf.qpid_topology_version == 2:
+             node_name = "amq.direct/%s" % msg_id
diff --git a/openstack-ceilometer.spec b/openstack-ceilometer.spec
index 9c71069..e25c2ff 100644
--- a/openstack-ceilometer.spec
+++ b/openstack-ceilometer.spec
@@ -3,8 +3,8 @@
 %global pypi_name ceilometer
 
 Name:             openstack-ceilometer
-Version:          2014.1
-Release:          2%{?dist}
+Version:          2014.1.1
+Release:          1%{?dist}
 Summary:          OpenStack measurement collection service
 
 Group:            Applications/System
@@ -30,9 +30,9 @@ Source16:         %{name}-notification.init
 Source160:        %{name}-notification.upstart
 
 #
-# patches_base=2014.1
+# patches_base=2014.1.1
 #
-Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
+Patch0001: 0001-Ensure-routing-key-is-specified-in-the-address-for-a.patch
 
 # This is EL6 specific and not upstream
 Patch100:         openstack-ceilometer-newdeps.patch
@@ -567,6 +567,12 @@ fi
 
 
 %changelog
+* Wed Jun 11 2014 Steve Linabery <slinaber at redhat.com> - 2014.1.1-1
+- Update to upstream 2014.1.1
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2014.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Wed May 07 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1-2
 - Avoid dependency issues with distributed installs (#1095414)
 
diff --git a/sources b/sources
index f36eb3d..7aabd80 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-36274d2a6cb49c267962893be5ef2ef6  ceilometer-2014.1.tar.gz
+6311c8054f781fd2c23bc737c6ef8898  ceilometer-2014.1.1.tar.gz