Age | Commit message (Collapse) | Author | |
---|---|---|---|
2013-06-19 | fix pep8 errors. | Juerg Haefliger | |
2013-05-09 | Allow lists to have no_replace option. | Joshua Harlow | |
2013-05-07 | A few more test files. | Joshua Harlow | |
2013-05-03 | A few pep8/pylint cleanups. | Joshua Harlow | |
2013-05-03 | A few more tests + cleanings. | Joshua Harlow | |
2013-05-03 | More merging adjustments. | Joshua Harlow | |
Looks like this should be in pretty good shape and has passed some of the basic backwards compat. merging tests that I added. | |||
2013-04-22 | Continue working on merging. | Joshua Harlow | |
2013-04-18 | Remove str merging for now. | Joshua Harlow | |
2013-04-18 | Pull from head and a couple more tweaks. | Joshua Harlow | |
2013-04-18 | Adjust how merging is done. | Joshua Harlow | |
2013-04-17 | Handle namespacing issues. | Joshua Harlow | |
Move from using the inbuilt type names as module names which is a bad thing to use it appears due to naming conflicts in the __init__ module and reduce the chances of these conflicts by enforcing a m_ prefix for merging modules. | |||
2013-03-07 | more pep8/pylint. all clean now | Scott Moser | |
2013-03-07 | fix pep8 and pylint | Scott Moser | |
2013-03-07 | change default merge type | Scott Moser | |
the default merge type here was appending to strings and extending lists. Instead we want the same default that cloud-init had previously, which was to overwrite lists and strings. | |||
2013-03-06 | Add some nice docs on what this is. | Joshua Harlow | |
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 | More cleanups. | Joshua Harlow | |
2012-11-22 | Allow mergers to take options. | 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. |