summaryrefslogtreecommitdiff
path: root/cloudinit/mergers/__init__.py
Commit message (Expand)AuthorAgeFilesLines
* Refactor: Drop inheritance from object (#1728)Alberto Contreras2022-09-141-1/+1
* Adopt Black and isort (SC-700) (#1157)James Falcon2021-12-151-20/+23
* cloudinit: remove unused LOG variables (#574)Daniel Watkins2020-09-161-2/+0
* Start removing dependency on six (#178)Daniel Watkins2020-01-211-3/+1
* LICENSE: Allow dual licensing GPL-3 or Apache 2.0Jon Grimm2016-12-221-15/+5
* Largely merge lp:~harlowja/cloud-init/py2-3 albeit manually because it seemedBarry Warsaw2015-01-211-1/+3
* Remove/adjust the verbose 'failed at attempted import of' logJoshua Harlow2014-09-021-4/+6
* Remove some of the more useless debug logsJoshua Harlow2014-07-151-5/+0
* More merging adjustments.Joshua Harlow2013-05-031-1/+1
* Continue working on merging.Joshua Harlow2013-04-221-2/+10
* Remove str merging for now.Joshua Harlow2013-04-181-1/+1
* Handle namespacing issues.Joshua Harlow2013-04-171-3/+8
* more pep8/pylint. all clean nowScott Moser2013-03-071-2/+0
* fix pep8 and pylintScott Moser2013-03-071-2/+3
* 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-051-11/+48
* Allow mergers to take options.Joshua Harlow2012-11-221-15/+22
* Start allowing different merging types to be appliedJoshua Harlow2012-11-201-0/+104