aboutsummaryrefslogtreecommitdiffstats
path: root/examples
AgeCommit message (Expand)AuthorFilesLines
2014-08-13Merge "Make removing nodes from scaled items possible."Jenkins1-0/+367
2014-08-13Switch to heat_template_version: 2013-05-23Steve Baker1-1/+1
2014-08-12Make removing nodes from scaled items possible.Robert Collins1-0/+367
2014-08-04Convert Fn::Select to extended get_attrSteve Baker4-169/+106
2014-08-04Port all templates to HOTSteve Baker14-14/+14
2014-08-01merge.py --hot to process and generate HOTSteve Baker23-5/+967
2014-03-06Fix Merge::Map for scatter-gather in Configs.Robert Collins1-0/+132
2014-02-21Add a Merge::Map feature.Robert Collins3-0/+344
2014-02-21Fix tests.Robert Collins1-0/+3
2014-02-17Add username parameter for rabbitRichard Su2-0/+4
2014-01-31Remove image parameter changing from mergeClint Byrum3-6/+6
2014-01-29Make scaling out a feature for merge.py.Robert Collins3-0/+286
2013-10-14Make LaunchConfiguration resources mergeableRoman Podolyaka3-0/+85
2013-09-30Add recursive whole-file __include__ tagClint Byrum4-0/+44
2013-09-25Refactor test_merge.bash for multiple testsClint Byrum1-2/+4
2013-09-19Add functional tests and examples for mergeClint Byrum3-0/+50