From 9d1f042f862c114f1613dcd5d2d8c401a1c54eaa Mon Sep 17 00:00:00 2001 From: harlowja Date: Fri, 22 Jun 2012 22:17:09 -0700 Subject: Fix syntax err, grrr --- cloudinit/util.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cloudinit/util.py b/cloudinit/util.py index 4c521bc3..baa3def1 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -643,7 +643,8 @@ def read_conf_d(confd): cfgs = [] for fn in confs: - cfgs.append(read_conf(os.path.join(confd, fn)) + cfgs.append(read_conf(os.path.join(confd, fn))) + return mergemanydict(cfgs) -- cgit v1.2.3