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
---
 setup.cfg | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'setup.cfg')

diff --git a/setup.cfg b/setup.cfg
index 7b192c46..f7f96639 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,10 +14,3 @@ classifier =
     Operating System :: POSIX :: Linux
     Programming Language :: Other
     Environment :: Console
-
-[files]
-packages =
-    tripleo_heat_merge
-[entry_points]
-console_scripts =
-    tripleo-heat-merge = tripleo_heat_merge.merge:main
-- 
cgit 1.2.3-korg