diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-05-09 22:34:31 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-05-09 22:34:31 -0700 |
| commit | 2b351c5435939d16ba06ec0c45847d47f4b21d51 (patch) | |
| tree | 15fb06e783875ff481fd3c148311eecde453bebb /tests/data/merge_sources/source12-1.yaml | |
| parent | ff232886555964220769da6d8b73198b5d51ef16 (diff) | |
| download | vyos-cloud-init-2b351c5435939d16ba06ec0c45847d47f4b21d51.tar.gz vyos-cloud-init-2b351c5435939d16ba06ec0c45847d47f4b21d51.zip | |
Fix the cloud config merging so that it is backwards compat.
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.
Diffstat (limited to 'tests/data/merge_sources/source12-1.yaml')
| -rw-r--r-- | tests/data/merge_sources/source12-1.yaml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/data/merge_sources/source12-1.yaml b/tests/data/merge_sources/source12-1.yaml new file mode 100644 index 00000000..09e7c899 --- /dev/null +++ b/tests/data/merge_sources/source12-1.yaml @@ -0,0 +1,8 @@ +#cloud-config + +a: + c: 1 + d: 2 + e: + z: a + y: b |