mirror of
https://github.com/clearml/clearml-agent
synced 2025-02-07 13:26:08 +00:00
Fix usage of not_set in k8s template merge
This commit is contained in:
parent
5f0d51d485
commit
82c5e55fe4
@ -17,7 +17,7 @@ def merge_dicts(dict1, dict2, custom_merge_func=None):
|
|||||||
res = None
|
res = None
|
||||||
if custom_merge_func:
|
if custom_merge_func:
|
||||||
res = custom_merge_func(k, dict1[k], dict2[k], _not_set)
|
res = custom_merge_func(k, dict1[k], dict2[k], _not_set)
|
||||||
dict1[k] = merge_dicts(dict1[k], dict2[k], custom_merge_func) if res is None else res
|
dict1[k] = merge_dicts(dict1[k], dict2[k], custom_merge_func) if res is _not_set else res
|
||||||
else:
|
else:
|
||||||
dict1[k] = dict2[k]
|
dict1[k] = dict2[k]
|
||||||
return dict1
|
return dict1
|
||||||
|
Loading…
Reference in New Issue
Block a user