diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-05-03 14:41:28 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-05-03 14:41:28 -0700 |
| commit | 4a669649b17cf01b6f89f7902b6683d02ef0bee1 (patch) | |
| tree | 6e20453047f74dccc8da58ab45f29e71a2f7de48 /cloudinit/mergers/__init__.py | |
| parent | e14d64a03c6aa3e567b57f0c0a003ca2185f4493 (diff) | |
| download | vyos-cloud-init-4a669649b17cf01b6f89f7902b6683d02ef0bee1.tar.gz vyos-cloud-init-4a669649b17cf01b6f89f7902b6683d02ef0bee1.zip | |
More merging adjustments.
Looks like this should be in pretty good shape and has passed some
of the basic backwards compat. merging tests that I added.
Diffstat (limited to 'cloudinit/mergers/__init__.py')
| -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 221e93b5..0978b2c6 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()+dict()" +DEF_MERGE_TYPE = "list()+dict()+str()" MERGER_PREFIX = 'm_' MERGER_ATTR = 'Merger' |