saltstack/salt — pull request #12194 by basepi (2014-04-22 19:32:03+00:00)
Title: Change user salt configs to .saltrc from .salt to prevent conflicts

Fixes #12169

As stated in #12169, LocalClient will sometimes look for a local salt config. It was looking for the file `~/.salt`. However, client_acl can also result in salt looking for (and creating) a directory of the same name. Now we use `~/.saltrc` instead for the file, so we don't conflict.