[openstack-tripleo-heat-templates] Updated patches from master-patches

[slagle]

commit 802310c219f95951e89379374f66f5bd6174889c
Author: James Slagle <jslagle at redhat.com>
Date:   Mon Sep 29 16:34:21 2014 -0400

    Updated patches from master-patches

 ...and-controller-templates-without-merge.py.patch |    2 +-
 ...erted-version-of-block-and-object-storage.patch |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/0001-Compute-and-controller-templates-without-merge.py.patch b/0001-Compute-and-controller-templates-without-merge.py.patch
index 041c568..a5b6e92 100644
--- a/0001-Compute-and-controller-templates-without-merge.py.patch
+++ b/0001-Compute-and-controller-templates-without-merge.py.patch
@@ -1,4 +1,4 @@
-From 963968afde9b14ba8cd67ebe89437012536e732c Mon Sep 17 00:00:00 2001
+From a761082918002eee5ef24685d1930a1a259c4711 Mon Sep 17 00:00:00 2001
 From: Tomas Sedovic <tsedovic at redhat.com>
 Date: Wed, 6 Aug 2014 13:24:10 +0200
 Subject: [PATCH] Compute and controller templates without merge.py
diff --git a/0002-Add-converted-version-of-block-and-object-storage.patch b/0002-Add-converted-version-of-block-and-object-storage.patch
index a70951e..db44809 100644
--- a/0002-Add-converted-version-of-block-and-object-storage.patch
+++ b/0002-Add-converted-version-of-block-and-object-storage.patch
@@ -1,4 +1,4 @@
-From 98d3444f406c54156561b225c1e1c0d656d671ea Mon Sep 17 00:00:00 2001
+From 99d6f99fab4b351b55dc2ee1b1d02729a92c9eb0 Mon Sep 17 00:00:00 2001
 From: Peter Belanyi <pbelanyi at redhat.com>
 Date: Wed, 24 Sep 2014 07:51:13 -0400
 Subject: [PATCH] Add converted version of block and object storage