From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 1 Dec 2015 22:46:44 +0000 (+0000)
Subject: Merge "Drop deprecated templates/Makefile/merge.py"
X-Git-Tag: opnfv-6.0.0~2282
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a3a6b30d1093113db6b909f833570e1574e8b454;p=apex-tripleo-heat-templates.git

Merge "Drop deprecated templates/Makefile/merge.py"
---

a3a6b30d1093113db6b909f833570e1574e8b454