saltstack/salt — pull request #9124 by terminalmage (2013-12-09 17:53:09+00:00)
Title: Fix "Invalid Changes data" in file.replace/blockreplace states

This commit returns the diffs from these two states within a dictionary,
instead of a string, getting rid of a warning that the changes data is
invalid.

Fixes #9123.