summaryrefslogtreecommitdiff
path: root/cloudinit/mergers
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2013-03-06 22:24:29 -0800
committerJoshua Harlow <harlowja@yahoo-inc.com>2013-03-06 22:24:29 -0800
commit21aec9e44c27b9bf1c96314f0449fd39793d1c73 (patch)
tree7af0afeb341d63da152239b60a429f3279c8ab8f /cloudinit/mergers
parent1e4f41e900a9c942354428b0f312428af00031ce (diff)
downloadvyos-cloud-init-21aec9e44c27b9bf1c96314f0449fd39793d1c73.tar.gz
vyos-cloud-init-21aec9e44c27b9bf1c96314f0449fd39793d1c73.zip
Add some nice docs on what this is.
Diffstat (limited to 'cloudinit/mergers')
-rw-r--r--cloudinit/mergers/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/mergers/__init__.py b/cloudinit/mergers/__init__.py
index 453426af..45e88fb3 100644
--- a/cloudinit/mergers/__init__.py
+++ b/cloudinit/mergers/__init__.py
@@ -85,7 +85,7 @@ class LookupMerger(UnknownMerger):
def dict_extract_mergers(config):
parsed_mergers = []
- raw_mergers = config.get('merger_how')
+ raw_mergers = config.get('merge_how')
if raw_mergers is None:
raw_mergers = config.get('merge_type')
if raw_mergers is None: