summaryrefslogtreecommitdiff
path: root/cloudinit/mergers/m_list.py
AgeCommit message (Expand)Author
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
2014-08-26fix(pep8): Fix various pep8 violations and version-lock pep8Jay Faulkner
2013-06-19fix pep8 errors.Juerg Haefliger
2013-05-09Allow lists to have no_replace option.Joshua Harlow
2013-05-07A few more test files.Joshua Harlow
2013-05-03A few pep8/pylint cleanups.Joshua Harlow
2013-05-03A few more tests + cleanings.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