saltstack/salt — pull request #5452 by terminalmage (2013-06-09 02:16:57+00:00)
Title: Remove errant re-assignment of pillar['master']['file_roots']

In 62a38a1, pillar['master']['flie_roots'] was set to the value of
pillar['master']['pillar_roots']. This causes the data in
pillar['master'] to be inaccurate. This commit removes that assignment
and thus corrects the pillar value.

This fixes #5449.