Merge pull request #28829 from basepi/merge-forward-2015.5

[2015.5] Merge forward from 2014.7 to 2015.5
This commit is contained in:
Colton Myers 2015-11-12 11:50:51 -07:00
commit e4a036365d

View file

@ -247,3 +247,12 @@ service.
auth_timeout:
The total time to wait for the authentication process to complete, regardless
of the number of attempts.
Salt Master Umask
=================
The salt master uses a cache to track jobs as they are published and returns come back.
The recommended umask for a salt-master is `022`, which is the default for most users
on a system. Incorrect umasks can result in permission-denied errors when the master
tries to access files in its cache.