← Back to branch summary

~ubuntu-branches/ubuntu/saucy/cloud-init/saucy

« back to all changes in this revision

Viewing changes to tests/data/merge_sources/source5-2.yaml

  • Committer: Package Import Robot
  • Author(s): Scott Moser
  • Date: 2013-06-05 11:12:46 UTC
  • mfrom: (282.1.1 saucy-proposed)
  • Revision ID: package-import@ubuntu.com-20130605111246-lykl8jrl8z410fkp
https://launchpad.net/bugs/1180867
* New upstream release.
  * fix merging routines to be backwards compatible (LP: #1180867)
  * fix for python 2.6

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/data/merge_sources/source5-2.yaml
 
1
#cloud-config
 
2
 
 
3
Blah: 3
 
4
Blah2: 2
 
5
Blah3: [1]
 
6
 
 
7
 
 
8
merge_how: 'dict(replace)+list(append)'