summaryrefslogtreecommitdiff
path: root/cloudinit/mergers/m_dict.py
AgeCommit message (Expand)Author
2020-01-21Start removing dependency on six (#178)Daniel Watkins
2016-12-22LICENSE: Allow dual licensing GPL-3 or Apache 2.0Jon Grimm
2015-01-21Largely merge lp:~harlowja/cloud-init/py2-3 albeit manually because it seemedBarry Warsaw
2013-05-03A few pep8/pylint cleanups.Joshua Harlow
2013-05-03More merging adjustments.Joshua Harlow
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