| Age | Commit message (Collapse) | Author |
|---|
|
Looks like this should be in pretty good shape and has passed some
of the basic backwards compat. merging tests that I added.
|
|
|
|
|
|
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.
|
|
|
|
|
|
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.
|
|
|
|
|
|
|
|
|
|
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.
|
