Merge pull request #25358 from dkiser/22241_pillar_merge_lists

Deep merge of pillar lists
This commit is contained in:
Mike Place 2015-07-13 09:51:01 -06:00
commit 90a1ca02a3

View file

@ -42,6 +42,9 @@ 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