summaryrefslogtreecommitdiff
path: root/cloudinit/mergers/m_list.py
Commit message (Expand)AuthorAgeFilesLines
* README: Mention move of revision control to git.HEADtrunkScott Moser2016-08-101-89/+0
* Largely merge lp:~harlowja/cloud-init/py2-3 albeit manually because it seemedBarry Warsaw2015-01-211-2/+4
* fix(pep8): Fix various pep8 violations and version-lock pep8Jay Faulkner2014-08-261-1/+1
* fix pep8 errors.Juerg Haefliger2013-06-191-0/+1
* Allow lists to have no_replace option.Joshua Harlow2013-05-091-3/+5
* A few more test files.Joshua Harlow2013-05-071-3/+9
* A few pep8/pylint cleanups.Joshua Harlow2013-05-031-1/+1
* A few more tests + cleanings.Joshua Harlow2013-05-031-2/+5
* More merging adjustments.Joshua Harlow2013-05-031-4/+5
* Continue working on merging.Joshua Harlow2013-04-221-11/+48
* Pull from head and a couple more tweaks.Joshua Harlow2013-04-181-19/+6
* Handle namespacing issues.Joshua Harlow2013-04-171-0/+50