diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-05-10 14:26:32 -0700 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-05-10 14:26:32 -0700 |
| commit | 638cc131857582e3df0c35b8a49433c660fdd299 (patch) | |
| tree | fcad890958997eff2e643f3141165e71bdd6eb71 /tests/data/merge_sources/expected12.yaml | |
| parent | 4697c1afcc7d05951f4717a83dad01d2360301c6 (diff) | |
| parent | 9f866ff5540558bab56f10e38481e4ad2efa079b (diff) | |
| download | vyos-cloud-init-638cc131857582e3df0c35b8a49433c660fdd299.tar.gz vyos-cloud-init-638cc131857582e3df0c35b8a49433c660fdd299.zip | |
Fixed merging capabilities.
Instead of previously having merging which was not backwards compatible
with the 0.7.1 and prior methods this patch works to ensure said backwards
compatible while at the same time making the new merging functionality
work in a more customizable manner.
Diffstat (limited to 'tests/data/merge_sources/expected12.yaml')
| -rw-r--r-- | tests/data/merge_sources/expected12.yaml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/data/merge_sources/expected12.yaml b/tests/data/merge_sources/expected12.yaml new file mode 100644 index 00000000..0421d2c8 --- /dev/null +++ b/tests/data/merge_sources/expected12.yaml @@ -0,0 +1,5 @@ +#cloud-config + +a: + e: + y: 2 |