summaryrefslogtreecommitdiff
path: root/cloudinit/mergers/m_dict.py
AgeCommit message (Collapse)Author
2013-05-03A few pep8/pylint cleanups.Joshua Harlow
2013-05-03More merging adjustments.Joshua Harlow
Looks like this should be in pretty good shape and has passed some of the basic backwards compat. merging tests that I added.
2013-04-22Continue working on merging.Joshua Harlow
2013-04-18Pull from head and a couple more tweaks.Joshua Harlow
2013-04-17Handle namespacing issues.Joshua Harlow
Move from using the inbuilt type names as module names which is a bad thing to use it appears due to naming conflicts in the __init__ module and reduce the chances of these conflicts by enforcing a m_ prefix for merging modules.