fix null merge

(cherry-picked from commit c1175a4106)

Signed-off-by: Ben Foster <bpfoster@gmail.com>
(cherry picked from commit f0b699eabb)
release-3.19
Ben Foster 6 months ago committed by Scott Rigby
parent 7cfb6e486d
commit 578564ee26
No known key found for this signature in database
GPG Key ID: C7C6FBB5B91C1155

@ -283,6 +283,11 @@ func coalesceTablesFullKey(printf printFn, dst, src map[string]interface{}, pref
if dst == nil {
return src
}
for key, val := range dst {
if val == nil {
src[key] = nil
}
}
// Because dest has higher precedence than src, dest values override src
// values.
for key, val := range src {

Loading…
Cancel
Save