summaryrefslogtreecommitdiff
path: root/ec2init/util.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2010-01-22 11:21:16 -0500
committerScott Moser <smoser@ubuntu.com>2010-01-22 11:21:16 -0500
commit1108a511010c4497e94bca78769bef30e3c01dff (patch)
tree56623e6a6e274fe27490b7912dac6bbb9b858383 /ec2init/util.py
parenta177947f41a187ea0c8ddda3bfb037fd3d0806d8 (diff)
downloadvyos-cloud-init-1108a511010c4497e94bca78769bef30e3c01dff.tar.gz
vyos-cloud-init-1108a511010c4497e94bca78769bef30e3c01dff.zip
fix reading of cloudconfig
Diffstat (limited to 'ec2init/util.py')
-rw-r--r--ec2init/util.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ec2init/util.py b/ec2init/util.py
index 8b36274e..c1da0e71 100644
--- a/ec2init/util.py
+++ b/ec2init/util.py
@@ -25,5 +25,5 @@ def mergedict(src,cand):
if k not in src:
src[k] = v
else:
- src[k] = merge(src[k],v)
+ src[k] = mergedict(src[k],v)
return src