aboutsummaryrefslogtreecommitdiffstats
path: root/tripleo_heat_merge/__init__.py
AgeCommit message (Expand)AuthorFilesLines
2015-11-25Drop deprecated templates/Makefile/merge.pyDan Prince1-0/+0
2013-12-17Make merge.py installable as a package using pbrmarios1-0/+0