aboutsummaryrefslogtreecommitdiffstats
path: root/tripleo_heat_merge/merge.py
AgeCommit message (Expand)AuthorFilesLines
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 pbrmarios1-0/+224