change default merge type

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.
This commit is contained in:
Scott Moser 2013-03-07 16:28:09 -05:00
parent 7bb21a6384
commit d01d493572

View File

@ -25,7 +25,7 @@ from cloudinit import type_utils
NAME_MTCH = re.compile(r"(^[a-zA-Z_][A-Za-z0-9_]*)\((.*?)\)$")
LOG = logging.getLogger(__name__)
DEF_MERGE_TYPE = "list(extend)+dict()+str(append)"
DEF_MERGE_TYPE = "list()+dict()+str()"
class UnknownMerger(object):