summaryrefslogtreecommitdiff
path: root/cloudinit/mergers
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-09-02Remove/adjust the verbose 'failed at attempted import of' logJoshua Harlow
2014-08-26fix(pep8): Fix various pep8 violations and version-lock pep8Jay Faulkner
2014-07-15Remove some of the more useless debug logsJoshua Harlow
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-18Remove str merging for now.Joshua Harlow
2013-04-18Pull from head and a couple more tweaks.Joshua Harlow
2013-04-18Adjust how merging is done.Joshua Harlow
2013-04-17Handle namespacing issues.Joshua Harlow
2013-03-07more pep8/pylint. all clean nowScott Moser
2013-03-07fix pep8 and pylintScott Moser
2013-03-07change default merge typeScott Moser
2013-03-06Add some nice docs on what this is.Joshua Harlow
2013-03-06Continue working on merging code.Joshua Harlow
2013-03-05Add in a bunch of changes and tests.Joshua Harlow
2012-11-22More cleanups.Joshua Harlow
2012-11-22Allow mergers to take options.Joshua Harlow
2012-11-20Start allowing different merging types to be appliedJoshua Harlow
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 17:41:42 +0000