summaryrefslogtreecommitdiff
path: root/tests/data/merge_sources
AgeCommit message (Expand)Author
2020-10-30Correct documentation and testcase data for some user-data YAML (#618)dermotbradley
2018-04-03correct documentation to match correct attribute name usage.Dominic Schlegel
2016-12-19doc: change 'nobootwait' to 'nofail' in docsAnhad Jai Singh
2013-05-09Fix the cloud config merging so that it is backwards compat.Joshua Harlow
2013-05-071 more test that does some list appending.Joshua Harlow
2013-05-07A few more test files.Joshua Harlow
2013-05-03More merging adjustments.Joshua Harlow
2013-04-23Add a bunch of new merging test files + runner.Joshua Harlow