[heat] Resolves: RHBZ#860726 Signed-off-by: Steven Dake <sdake at redhat.com>

[Steven Dake]

commit 2b26e39781ca8b86ca4667516183118b15778c0a
Author: Steven Dake <sdake at redhat.com>
Date:   Wed Sep 26 08:12:49 2012 -0700

    Resolves: RHBZ#860726 Signed-off-by: Steven Dake <sdake at redhat.com>

 heat.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/heat.spec b/heat.spec
index 2eb93e4..28e8fdc 100644
--- a/heat.spec
+++ b/heat.spec
@@ -1,7 +1,7 @@
 Name: heat
 Summary: This software provides AWS CloudFormation functionality for OpenStack Essex
 Version: 6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: ASL 2.0
 Group: System Environment/Base
 URL: http://heat-api.org
@@ -13,6 +13,7 @@ Source4: heat-metadata.service
 Source5: heat-api-cloudwatch.service
 
 Patch0: switch-to-using-m2crypto.patch
+Patch1: heat-fix-glanceclient-deprecation-warning.patch
 
 BuildArch: noarch
 BuildRequires: python2-devel
@@ -46,6 +47,7 @@ Requires(pre): shadow-utils
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -129,6 +131,11 @@ exit 0
 %systemd_postun_with_restart heat-api-cloudwatch.service
 
 %changelog
+* Wed Sep 25 2012 Steven Dake <sdake at redhat.com> 6-5
+- Merge upstream commit d9f63269f1a0205811cd84487787c8c1291a952b
+- Resolves: RHBZ#860726
+- fix "heat cli prints warning on each operation"
+
 * Wed Sep 26 2012 Jeff Peeler <jpeeler at redhat.com> 6-4
 - switch requires to python-glanceclient