[openstack-heat] Update to icehouse-2

[Jeff Peeler]

commit 2cb9a6628f9458cb1deeb8bb651f8f5e47134be0
Author: Jeff Peeler <jpeeler at redhat.com>
Date:   Mon Jan 27 12:37:29 2014 -0500

    Update to icehouse-2

 .gitignore          |    1 +
 openstack-heat.spec |   10 ++++++----
 sources             |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b7b5dbc..adc1edc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /heat-2013.2.rc2.tar.gz
 /heat-2013.2.tar.gz
 /heat-2014.1.b1.tar.gz
+/heat-2014.1.b2.tar.gz
diff --git a/openstack-heat.spec b/openstack-heat.spec
index 414c6db..5388417 100644
--- a/openstack-heat.spec
+++ b/openstack-heat.spec
@@ -1,6 +1,6 @@
 %global release_name icehouse
 %global release_letter b
-%global milestone 1
+%global milestone 2
 %global full_release heat-%{version}.%{release_letter}%{milestone}
 
 %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
@@ -24,7 +24,7 @@ Source5:	openstack-heat-api-cloudwatch.service
 Source20:   heat-dist.conf
 
 #
-# patches_base=2013.2
+# patches_base=2014.1.b2
 #
 Patch0001: 0001-Switch-to-using-M2Crypto.patch
 Patch0002: 0002-remove-pbr-runtime-dependency.patch
@@ -210,8 +210,7 @@ Components common to all OpenStack Heat services
 %config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/templates/*
 %if 0%{?with_doc}
 %{_mandir}/man1/heat-keystone-setup.1.gz
-# TODO: enable icehouse-2, https://review.openstack.org/#/c/61212/
-#%{_mandir}/man1/heat-manage.1.gz
+%{_mandir}/man1/heat-manage.1.gz
 %endif
 
 %pre common
@@ -359,6 +358,9 @@ AWS CloudWatch-compatible API to the Heat Engine
 
 
 %changelog
+* Mon Jan 27 2014 Jeff Peeler <jpeeler at redhat.com> - 2014.1-0.4.b2
+- update to icehouse-2
+
 * Mon Jan 06 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1-0.4.b1
 - Avoid [keystone_authtoken] config corruption in heat.conf
 
diff --git a/sources b/sources
index b7c8835..86e09de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8e33e90c716cf2daa20c1fee3c7f1a6a  heat-2014.1.b1.tar.gz
+81dc341f6b65d98fb9f1f25f9c3456ba  heat-2014.1.b2.tar.gz