From 1af036a36ad0e3b24820ca6be6f4355388e3679a Mon Sep 17 00:00:00 2001 From: Erik Johnson Date: Tue, 11 Dec 2018 07:45:30 -0600 Subject: [PATCH] Return the diff dict instead of the dictdiffer object --- salt/states/file.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/states/file.py b/salt/states/file.py index cb58c7bb772d..7dbdd7c7e6e5 100644 --- a/salt/states/file.py +++ b/salt/states/file.py @@ -7311,7 +7311,7 @@ def serialize(name, if isinstance(existing_data, dict) and isinstance(merged_data, dict): ret['changes']['diff'] = salt.utils.dictdiffer.recursive_diff( - existing_data, merged_data) + existing_data, merged_data).diffs return ret