[heat/f18] Make f18 branch match master to make merging easier

[Jeff Peeler]

commit 2a98fe474fb1a202a22097737a07ef908099996f
Author: Jeff Peeler <jpeeler at redhat.com>
Date:   Wed Sep 26 12:57:21 2012 -0400

    Make f18 branch match master to make merging easier
    
    Signed-off-by: Jeff Peeler <jpeeler at redhat.com>

 ...heat-fix-glanceclient-deprecation-warning.patch |    0
 heat.spec                                          |   10 +++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/import-glanceclient.patch b/heat-fix-glanceclient-deprecation-warning.patch
similarity index 100%
rename from import-glanceclient.patch
rename to heat-fix-glanceclient-deprecation-warning.patch
diff --git a/heat.spec b/heat.spec
index 4844d5b..1c27f6d 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
@@ -14,7 +14,7 @@ Source5: heat-api-cloudwatch.service
 
 Patch0: switch-to-using-m2crypto.patch
 # Patch1 to stay until v7 released
-Patch1: import-glanceclient.patch
+Patch1: heat-fix-glanceclient-deprecation-warning.patch
 
 BuildArch: noarch
 BuildRequires: python2-devel
@@ -132,9 +132,13 @@ exit 0
 %systemd_postun_with_restart heat-api-cloudwatch.service
 
 %changelog
+* Wed Sep 26 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
-- add patch to make use of new import
 
 * Tue Sep 25 2012 Jeff Peeler <jpeeler at redhat.com> 6-3
 - change systemd scripts to use openstack-heat user