summaryrefslogtreecommitdiff
path: root/cloudinit/mergers
Commit message (Expand)AuthorAgeFilesLines
* Largely merge lp:~harlowja/cloud-init/py2-3 albeit manually because it seemedBarry Warsaw2015-01-214-8/+16
* Remove/adjust the verbose 'failed at attempted import of' logJoshua Harlow2014-09-021-4/+6
* fix(pep8): Fix various pep8 violations and version-lock pep8Jay Faulkner2014-08-261-1/+1
* Remove some of the more useless debug logsJoshua Harlow2014-07-151-5/+0
* 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-032-6/+3
* A few more tests + cleanings.Joshua Harlow2013-05-031-2/+5
* More merging adjustments.Joshua Harlow2013-05-034-13/+69
* Continue working on merging.Joshua Harlow2013-04-223-35/+109
* Remove str merging for now.Joshua Harlow2013-04-182-40/+1
* Pull from head and a couple more tweaks.Joshua Harlow2013-04-184-9/+13
|\
| * Handle namespacing issues.Joshua Harlow2013-04-174-3/+8
* | Adjust how merging is done.Joshua Harlow2013-04-182-17/+6
|/
* more pep8/pylint. all clean nowScott Moser2013-03-071-2/+0
* fix pep8 and pylintScott Moser2013-03-072-3/+4
* change default merge typeScott Moser2013-03-071-1/+1
* Add some nice docs on what this is.Joshua Harlow2013-03-061-1/+1
* Continue working on merging code.Joshua Harlow2013-03-061-3/+10
* Add in a bunch of changes and tests.Joshua Harlow2013-03-054-20/+76
* More cleanups.Joshua Harlow2012-11-222-10/+4
* Allow mergers to take options.Joshua Harlow2012-11-224-30/+59
* Start allowing different merging types to be appliedJoshua Harlow2012-11-204-0/+206