-
Committer:
Joshua Harlow
-
Date:
2012-11-21 04:02:48 UTC
-
mto:
This revision was merged to the branch mainline in
revision
795.
-
Revision ID:
harlowja@gmail.com-20121121040248-4q95vccwv9qyjvop
Start allowing different merging types to be applied
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.