summaryrefslogtreecommitdiff
path: root/cloudinit/mergers/__init__.py
AgeCommit message (Expand)Author
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-22Allow mergers to take options.Joshua Harlow
2012-11-20Start allowing different merging types to be appliedJoshua Harlow