Revert "Deep merge of pillar lists"

This reverts commit d030e289b3.
This commit is contained in:
Colton Myers 2015-08-04 16:46:00 -06:00
parent c168159750
commit 8a0e8e0460

View file

@ -42,9 +42,6 @@ def update(dest, upd, recursive_update=True):
and isinstance(val, collections.Mapping):
ret = update(dest_subkey, val)
dest[key] = ret
elif isinstance(dest_subkey, list) \
and isinstance(val, list):
dest[key] = dest.get(key, []) + val
else:
dest[key] = upd[key]
return dest