saltstack/salt — pull request #6305 by terminalmage (2013-07-25 03:55:34+00:00)
Title: Fix minion traceback when pillar SLS is malformed

When pillar data is rendered for use by pillar.get, SLS that does not
render to a dictionary results in a traceback on the minion. This commit
resolves that traceback.

Fixes #5910.