[openstack-heat] Rebase to 2014.2.rc1

[Ryan Brown]

commit c993eaab8313ecbba5c2f8651e877a8c97ccde71
Author: Ryan S. Brown <rybrown at redhat.com>
Date:   Fri Oct 3 08:54:51 2014 -0400

    Rebase to 2014.2.rc1

 .gitignore                                         |    1 +
 0001-remove-pbr-runtime-dependency.patch           |    2 +-
 ...bility-patch-to-allow-smooth-migration-aw.patch |    2 +-
 ...t-keystone-setup-domain-to-sphinx-conf.py.patch |   27 --------------------
 openstack-heat.spec                                |   13 +++++----
 sources                                            |    2 +-
 6 files changed, 11 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5eb7463..7f9f692 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /heat-2014.2.b1.tar.gz
 /heat-2014.2.b2.tar.gz
 /heat-2014.2.b3.tar.gz
+/heat-2014.2.rc1.tar.gz
diff --git a/0001-remove-pbr-runtime-dependency.patch b/0001-remove-pbr-runtime-dependency.patch
index 5ba0ea4..010b9bc 100644
--- a/0001-remove-pbr-runtime-dependency.patch
+++ b/0001-remove-pbr-runtime-dependency.patch
@@ -1,4 +1,4 @@
-From 0470d02ba2bb22d7c274ac1002dbd3c27cef257f Mon Sep 17 00:00:00 2001
+From 2f312ff6c9e2043d22732a55a98ad3094a99e197 Mon Sep 17 00:00:00 2001
 From: Jeff Peeler <jpeeler at redhat.com>
 Date: Mon, 14 Oct 2013 14:30:34 -0400
 Subject: [PATCH] remove pbr runtime dependency
diff --git a/0002-Add-compatability-patch-to-allow-smooth-migration-aw.patch b/0002-Add-compatability-patch-to-allow-smooth-migration-aw.patch
index 1859b5d..3a61bdc 100644
--- a/0002-Add-compatability-patch-to-allow-smooth-migration-aw.patch
+++ b/0002-Add-compatability-patch-to-allow-smooth-migration-aw.patch
@@ -1,4 +1,4 @@
-From 0f22fbd1a7d88fc85ab3e1b75c9e192dc8954df1 Mon Sep 17 00:00:00 2001
+From 7b7c46d82624d06657ea84bc1d3426f0f441361f Mon Sep 17 00:00:00 2001
 From: Jeff Peeler <jpeeler at redhat.com>
 Date: Sat, 21 Jun 2014 00:28:04 -0400
 Subject: [PATCH] Add compatability patch to allow smooth migration away from
diff --git a/openstack-heat.spec b/openstack-heat.spec
index c2506c2..116373b 100644
--- a/openstack-heat.spec
+++ b/openstack-heat.spec
@@ -1,6 +1,6 @@
 %global release_name juno
-%global release_letter b
-%global milestone 3
+%global release_letter rc
+%global milestone 1
 %global full_release heat-%{version}.%{release_letter}%{milestone}
 
 %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
@@ -8,7 +8,7 @@
 Name:		openstack-heat
 Summary:	OpenStack Orchestration (heat)
 Version:	2014.2
-Release:	0.5.%{release_letter}%{milestone}%{?dist}
+Release:	0.6.%{release_letter}%{milestone}%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
 URL:		http://www.openstack.org
@@ -31,11 +31,10 @@ Source5:	openstack-heat-api-cloudwatch.service
 Source20:	heat-dist.conf
 
 #
-# patches_base=2014.2.b3+0
+# patches_base=2014.2.rc1+0
 #
 Patch0001: 0001-remove-pbr-runtime-dependency.patch
 Patch0002: 0002-Add-compatability-patch-to-allow-smooth-migration-aw.patch
-Patch0003: 0003-Add-heat-keystone-setup-domain-to-sphinx-conf.py.patch
 
 BuildArch: noarch
 BuildRequires: git
@@ -100,7 +99,6 @@ Requires: %{name}-api-cloudwatch = %{version}-%{release}
 
 %patch0001 -p1
 %patch0002 -p1
-%patch0003 -p1
 
 sed -i s/REDHATHEATVERSION/%{version}/ heat/version.py
 sed -i s/REDHATHEATRELEASE/%{release}/ heat/version.py
@@ -524,6 +522,9 @@ fi
 
 
 %changelog
+* Fri Oct  3 2014 Ryan Brown <rybrown at redhat.com> - 2014.2-0.6.rc1
+- Update to upstream 2014.2.rc1
+
 * Tue Sep  9 2014 Ryan Brown <rybrown at redhat.com> - 2014.2-0.5.b3
 - Add dependencies for oslo-i18n, keystonemiddleware, and saharaclient
 - Update patches for 2014.2.b3
diff --git a/sources b/sources
index ec365fa..582dcc2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-da36224335250221dfef4ed084670490  heat-2014.2.b3.tar.gz
+0e0119f7062995617f4b9bfc5ad019b5  heat-2014.2.rc1.tar.gz