diff options
| author | Joshua Harlow <harlowja@gmail.com> | 2012-11-22 19:45:43 -0800 |
|---|---|---|
| committer | Joshua Harlow <harlowja@gmail.com> | 2012-11-22 19:45:43 -0800 |
| commit | 3941466b3e065c9ce7bb7500e41f464993861672 (patch) | |
| tree | 152ff7635217238d1ee562fd72df688c4c924599 /cloudinit/handlers | |
| parent | 180e83b20aa02dc9df903fa7e31121dd49a49b3a (diff) | |
| download | vyos-cloud-init-3941466b3e065c9ce7bb7500e41f464993861672.tar.gz vyos-cloud-init-3941466b3e065c9ce7bb7500e41f464993861672.zip | |
Allow mergers to take options.
Diffstat (limited to 'cloudinit/handlers')
| -rw-r--r-- | cloudinit/handlers/cloud_config.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/handlers/cloud_config.py b/cloudinit/handlers/cloud_config.py index 9a8782bb..02a7ad9d 100644 --- a/cloudinit/handlers/cloud_config.py +++ b/cloudinit/handlers/cloud_config.py @@ -29,7 +29,7 @@ from cloudinit.settings import (PER_ALWAYS) LOG = logging.getLogger(__name__) -DEF_MERGE_TYPE = "list+dict+str" +DEF_MERGE_TYPE = "list()+dict()+str()" MERGE_HEADER = 'Merge-Type' |