summaryrefslogtreecommitdiff
path: root/tests/data/merge_sources
AgeCommit message (Collapse)Author
2013-05-09Fix the cloud config merging so that it is backwards compat.Joshua Harlow
The new change for merging works well in the mergedict case but the default merging type for cloud config needs to reflect how yaml was loaded in bulk, which is the same as the replacing keys merging type that is now provided.
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
Looks like this should be in pretty good shape and has passed some of the basic backwards compat. merging tests that I added.
2013-04-23Add a bunch of new merging test files + runner.Joshua Harlow