summaryrefslogtreecommitdiff
path: root/cloudinit/handlers/cloud_config.py
AgeCommit message (Expand)Author
2013-04-22Continue working on merging.Joshua Harlow
2013-04-17Altering the order of merging.Joshua Harlow
2013-03-07more pep8/pylint. all clean nowScott Moser
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-22Add which files the yaml blob came from.Joshua Harlow
2012-11-22Adjust naming and exception catching.Joshua Harlow
2012-11-22Change the yaml merge header extraction to be in a sep. function that can loo...Joshua Harlow
2012-11-22Continue work.Joshua Harlow
2012-11-22Select merge-type from either header or content after loading as yaml.Joshua Harlow
2012-11-22Continue working on merging prototype.Joshua Harlow
2012-11-20Start allowing different merging types to be appliedJoshua Harlow
2012-06-16Make the top level __init__ similar to the other top level __inits__ where ju...Joshua Harlow
2012-06-15Fixups to ensure that pylint does not find anything major wrong.Joshua Harlow
2012-06-15Moved the user_data directory back to a user_data.py and made a handler subdi...Joshua Harlow