diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-04-18 14:15:37 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-04-18 14:15:37 -0700 |
| commit | 50f91a1bca166b5e815a722aca573672b269bacb (patch) | |
| tree | 040e01df6829b9a676e9f54c0b337722fc71df4e /cloudinit/mergers/__init__.py | |
| parent | d6cfa558c060d3e19073cc569590afc9a2f1b9ff (diff) | |
| download | vyos-cloud-init-50f91a1bca166b5e815a722aca573672b269bacb.tar.gz vyos-cloud-init-50f91a1bca166b5e815a722aca573672b269bacb.zip | |
Remove str merging for now.
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 f504e15f..2702496b 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()+str()" +DEF_MERGE_TYPE = "list()+dict()" MERGER_PREFIX = 'm_' MERGER_ATTR = 'Merger' |