← Back to branch summary

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

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

Viewing all changes in revision 292.

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

files added:
tests/data/merge_sources

tests/data/merge_sources/expected1.yaml

tests/data/merge_sources/expected10.yaml

tests/data/merge_sources/expected11.yaml

tests/data/merge_sources/expected12.yaml

tests/data/merge_sources/expected2.yaml

tests/data/merge_sources/expected3.yaml

tests/data/merge_sources/expected4.yaml

tests/data/merge_sources/expected5.yaml

tests/data/merge_sources/expected6.yaml

tests/data/merge_sources/expected7.yaml

tests/data/merge_sources/expected8.yaml

tests/data/merge_sources/expected9.yaml

tests/data/merge_sources/source1-1.yaml

tests/data/merge_sources/source1-2.yaml

tests/data/merge_sources/source10-1.yaml

tests/data/merge_sources/source10-2.yaml

tests/data/merge_sources/source11-1.yaml

tests/data/merge_sources/source11-2.yaml

tests/data/merge_sources/source11-3.yaml

tests/data/merge_sources/source12-1.yaml

tests/data/merge_sources/source12-2.yaml

tests/data/merge_sources/source2-1.yaml

tests/data/merge_sources/source2-2.yaml

tests/data/merge_sources/source3-1.yaml

tests/data/merge_sources/source3-2.yaml

tests/data/merge_sources/source4-1.yaml

tests/data/merge_sources/source4-2.yaml

tests/data/merge_sources/source5-1.yaml

tests/data/merge_sources/source5-2.yaml

tests/data/merge_sources/source6-1.yaml

tests/data/merge_sources/source6-2.yaml

tests/data/merge_sources/source7-1.yaml

tests/data/merge_sources/source7-2.yaml

tests/data/merge_sources/source8-1.yaml

tests/data/merge_sources/source8-2.yaml

tests/data/merge_sources/source9-1.yaml

tests/data/merge_sources/source9-2.yaml

files modified:
ChangeLog

cloudinit/handlers/cloud_config.py

cloudinit/mergers/__init__.py

cloudinit/mergers/m_dict.py

cloudinit/mergers/m_list.py

cloudinit/mergers/m_str.py

cloudinit/url_helper.py

cloudinit/util.py

debian/changelog

debian/control

tests/unittests/test_handler/test_handler_set_hostname.py

tests/unittests/test_merging.py

tests/unittests/test_userdata.py

Show diffs side-by-side

added added

removed removed

cloudinit/handlers/cloud_config.py

cloudinit/mergers/__init__.py

cloudinit/mergers/m_dict.py

cloudinit/mergers/m_list.py

cloudinit/mergers/m_str.py

cloudinit/url_helper.py

cloudinit/util.py

debian/changelog

tests/data/merge_sources/

tests/data/merge_sources/expected1.yaml

tests/data/merge_sources/expected10.yaml

tests/data/merge_sources/expected11.yaml

tests/data/merge_sources/expected12.yaml

tests/data/merge_sources/expected2.yaml

tests/data/merge_sources/expected3.yaml

tests/data/merge_sources/expected4.yaml

tests/data/merge_sources/expected5.yaml

tests/data/merge_sources/expected6.yaml

tests/data/merge_sources/expected7.yaml

tests/data/merge_sources/expected8.yaml

tests/data/merge_sources/expected9.yaml

tests/data/merge_sources/source1-1.yaml

tests/data/merge_sources/source1-2.yaml

tests/data/merge_sources/source10-1.yaml

tests/data/merge_sources/source10-2.yaml

tests/data/merge_sources/source11-1.yaml

tests/data/merge_sources/source11-2.yaml

tests/data/merge_sources/source11-3.yaml

tests/data/merge_sources/source12-1.yaml

tests/data/merge_sources/source12-2.yaml

tests/data/merge_sources/source2-1.yaml

tests/data/merge_sources/source2-2.yaml

tests/data/merge_sources/source3-1.yaml

tests/data/merge_sources/source3-2.yaml

tests/data/merge_sources/source4-1.yaml

tests/data/merge_sources/source4-2.yaml

tests/data/merge_sources/source5-1.yaml

tests/data/merge_sources/source5-2.yaml

tests/data/merge_sources/source6-1.yaml

tests/data/merge_sources/source6-2.yaml

tests/data/merge_sources/source7-1.yaml

tests/data/merge_sources/source7-2.yaml

tests/data/merge_sources/source8-1.yaml

tests/data/merge_sources/source8-2.yaml

tests/data/merge_sources/source9-1.yaml

tests/data/merge_sources/source9-2.yaml

tests/unittests/test_handler/test_handler_set_hostname.py

tests/unittests/test_merging.py

tests/unittests/test_userdata.py

Older »