vyos-cloud-init.git/tests/data/merge_sources/expected2.yaml, branch rolling (mirror of https://github.com/vyos/vyos-cloud-init.git) https://git.amelek.net/vyos/vyos-cloud-init.git/atom?h=rolling 2013-05-10T05:34:31+00:00 Fix the cloud config merging so that it is backwards compat. 2013-05-10T05:34:31+00:00 Joshua Harlow harlowja@yahoo-inc.com 2013-05-10T05:34:31+00:00 urn:sha1:2b351c5435939d16ba06ec0c45847d47f4b21d51 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. More merging adjustments. 2013-05-03T21:41:28+00:00 Joshua Harlow harlowja@yahoo-inc.com 2013-05-03T21:41:28+00:00 urn:sha1:4a669649b17cf01b6f89f7902b6683d02ef0bee1 Looks like this should be in pretty good shape and has passed some of the basic backwards compat. merging tests that I added. Add a bunch of new merging test files + runner. 2013-04-24T05:53:53+00:00 Joshua Harlow harlowja@yahoo-inc.com 2013-04-24T05:53:53+00:00 urn:sha1:e14d64a03c6aa3e567b57f0c0a003ca2185f4493