aboutsummaryrefslogtreecommitdiffstats
path: root/tripleo_heat_merge
AgeCommit message (Expand)AuthorFilesLines
2015-11-25Drop deprecated templates/Makefile/merge.pyDan Prince2-436/+0
2014-09-10Deprecate Role and ImageBuilder metadata handlingTomas Sedovic1-0/+7
2014-08-13Merge "Make removing nodes from scaled items possible."Jenkins1-8/+15
2014-08-13Switch to heat_template_version: 2013-05-23Steve Baker1-1/+1
2014-08-12Make removing nodes from scaled items possible.Robert Collins1-8/+15
2014-08-04Port all templates to HOTSteve Baker1-1/+1
2014-08-01merge.py --hot to process and generate HOTSteve Baker1-0/+27
2014-07-18merge.py use a class to represent template syntaxSteve Baker1-52/+73
2014-04-16Switch overcloud to software-configClint Byrum1-1/+7
2014-03-06Fix Merge::Map for scatter-gather in Configs.Robert Collins1-1/+6
2014-02-21Add a Merge::Map feature.Robert Collins1-0/+22
2014-01-31Remove image parameter changing from mergeClint Byrum1-11/+19
2014-01-29Make scaling out a feature for merge.py.Robert Collins1-2/+104
2014-01-29Permit writing output to other than stdout.Robert Collins1-1/+8
2013-12-17Make merge.py installable as a package using pbrmarios2-0/+224