[openstack-tripleo-heat-templates/f21] Revert "Updated patches from master-patches"

[slagle]

commit a76832da0a114e712965ed5621bf24c58a45d19c
Author: James Slagle <jslagle at redhat.com>
Date:   Fri Oct 3 08:00:50 2014 -0400

    Revert "Updated patches from master-patches"
    
    This reverts commit 39caf8bc4ff1f18847fb3edcb9c21085e707ecc1.

 ...and-controller-templates-without-merge.py.patch | 2067 --------------------
 ...erted-version-of-block-and-object-storage.patch |  441 -----
 openstack-tripleo-heat-templates.spec              |    6 -
 3 files changed, 0 insertions(+), 2514 deletions(-)
---
diff --git a/openstack-tripleo-heat-templates.spec b/openstack-tripleo-heat-templates.spec
index e5ebf86..c483cae 100644
--- a/openstack-tripleo-heat-templates.spec
+++ b/openstack-tripleo-heat-templates.spec
@@ -7,9 +7,6 @@ Group:		System Environment/Base
 URL:		https://wiki.openstack.org/wiki/TripleO
 Source0:	http://tarballs.openstack.org/tripleo-heat-templates/tripleo-heat-templates-%{version}.tar.gz
 
-Patch0001: 0001-Compute-and-controller-templates-without-merge.py.patch
-Patch0002: 0002-Add-converted-version-of-block-and-object-storage.patch
-
 BuildArch:	noarch
 BuildRequires:	python2-devel
 BuildRequires:	python-setuptools
@@ -25,9 +22,6 @@ building Heat Templates to do deployments of OpenStack.
 %prep
 %setup -q -n tripleo-heat-templates-%{version}
 
-%patch0001 -p1
-%patch0002 -p1
-
 %build
 %{__python2} setup.py build