diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-03-07 16:28:09 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-03-07 16:28:09 -0500 |
| commit | 9a771ec66f4e79bcd30f7cad7ef4b67e9cc7512d (patch) | |
| tree | 731ddd37ed2dc5211b13e79a13870432931d1071 /cloudinit/mergers | |
| parent | 3199df6e1489da03d51ac8a2a4574c27fd325189 (diff) | |
| download | cloud-init-git-9a771ec66f4e79bcd30f7cad7ef4b67e9cc7512d.tar.gz | |
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.
Diffstat (limited to 'cloudinit/mergers')
| -rw-r--r-- | cloudinit/mergers/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/mergers/__init__.py b/cloudinit/mergers/__init__.py index 45e88fb3..3b56686f 100644 --- a/cloudinit/mergers/__init__.py +++ b/cloudinit/mergers/__init__.py @@ -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): |