From fba215a69da02a97f5132671c43a2cc6a5a2c2d1 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Wed, 25 Nov 2015 11:17:14 -0500
Subject: Drop deprecated templates/Makefile/merge.py

This patch drops a bunch of deprecated stuff from
tripleo-heat-templates. Once we remove the Makefile
(which creates overcloud.yaml) we can proceed
in renaming overcloud-without-mergepy.yaml to
overcloud.yaml.

Change-Id: Ic6ab3777d19e207cae29dcbc2e3839815cd80181
---
 README.rst | 2 --
 1 file changed, 2 deletions(-)

(limited to 'README.rst')

diff --git a/README.rst b/README.rst
index 148a741f..3093fc48 100644
--- a/README.rst
+++ b/README.rst
@@ -29,8 +29,6 @@ Directories
 
 A description of the directory layout in TripleO Heat Templates.
 
- * deprecated: contains templates that have been deprecated
-
  * environments: contains heat environment files that can be used with -e
                  on the command like to enable features, etc.
 
-- 
cgit 1.2.3-korg