← Back to branch summary

~smoser/ubuntu/vivid/cloud-init/2to3

« 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-04-11 12:55:51 UTC
  • mfrom: (245.3.9 raring-proposed)
  • Revision ID: package-import@ubuntu.com-20130411125551-8k60jsoot7t21z4b
https://launchpad.net/bugs/1164147
* New upstream snapshot.
  * make apt-get invoke 'dist-upgrade' rather than 'upgrade' for
    package_upgrade. (LP: #1164147)
  * workaround 2.6 kernel issue that stopped blkid from showing /dev/sr0

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)'