summaryrefslogtreecommitdiff
path: root/tests/data/merge_sources/expected12.yaml
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.