summaryrefslogtreecommitdiffstats
path: root/merge.py
AgeCommit message (Expand)AuthorFilesLines
2013-08-08Fixed merge code populating properties from yaml.divakar-padiyar-nandavar1-1/+2
2013-07-10Add handling of parameter replacements.Clint Byrum1-0/+21
2013-07-10Add FileInclude special type.Clint Byrum1-0/+7
2013-07-10Make merge.py output deterministic.Robert Collins1-4/+4
2013-06-06Add ability to combine roles into one role.Clint Byrum1-1/+28
2013-06-06Support DependsOnClint Byrum1-0/+3
2013-06-06Replace in AllowedResourcesClint Byrum1-0/+5
2013-06-06Create a utility for merging templates.Clint Byrum1-0/+98