Viewing all changes in revision 813.
- Committer: Scott Moser
- Date: 2013-05-10 21:26:32 UTC
- mfrom: (810.1.18 merging-order)
- Revision ID: smoser@ubuntu.com-20130510212632-g3n5h3ex4x6yl74i
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.
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.
- files added:
- cloudinit/mergers/m_str.py
- tests/data/merge_sources
- files removed:
- cloudinit/mergers/m_str.py
- files modified:
- cloudinit/handlers/cloud_config.py
expand all
collapse all
added
removed
