Age | Commit message (Collapse) | Author | |
---|---|---|---|
2013-04-17 | Altering the order of merging. | Joshua Harlow | |
2013-03-07 | more pep8/pylint. all clean now | Scott Moser | |
2013-03-06 | Continue working on merging code. | Joshua Harlow | |
2013-03-05 | Add in a bunch of changes and tests. | Joshua Harlow | |
2012-11-22 | Allow mergers to take options. | Joshua Harlow | |
2012-11-22 | Add which files the yaml blob came from. | Joshua Harlow | |
2012-11-22 | Adjust naming and exception catching. | Joshua Harlow | |
2012-11-22 | Change the yaml merge header extraction to be in a sep. function that can ↵ | Joshua Harlow | |
look in more places. | |||
2012-11-22 | Continue work. | Joshua Harlow | |
2012-11-22 | Select merge-type from either header or content after loading as yaml. | Joshua Harlow | |
2012-11-22 | Continue working on merging prototype. | Joshua Harlow | |
2012-11-20 | Start allowing different merging types to be applied | Joshua Harlow | |
After user data handling splits apart all the different content types into there various mime messages it is nice to be able to have each message specify how it should be merged (mainly for cloud-config or cloud-archive) into the single cloud config that is eventually used. This starts to add a plugable merging framework and the needed components to activate said headers and merging. | |||
2012-06-16 | Make the top level __init__ similar to the other top level __inits__ where ↵ | Joshua Harlow | |
just util functions and base classes are defined there. | |||
2012-06-15 | Fixups to ensure that pylint does not find anything major wrong. | Joshua Harlow | |
2012-06-15 | Moved the user_data directory back to a user_data.py and made a handler ↵ | Joshua Harlow | |
subdir for just the internal handlers. |