Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8

Conflicts:
    doc/topics/troubleshooting/master.rst

doc/topics/troubleshooting/master.rst

@@ -274,3 +274,12 @@ The default configuration for the ``file_roots`` is:
        - /srv/salt
 
 So the top file is defaulted to the location ``/srv/salt/top.sls``
+
+
+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.

salt/config.py

@@ -1139,7 +1139,7 @@ DEFAULT_MASTER_OPTS = {
     'keysize': 2048,
     'transport': 'zeromq',
     'enumerate_proxy_minions': False,
-    'gather_job_timeout': 5,
+    'gather_job_timeout': 10,
     'syndic_event_forward_timeout': 0.5,
     'syndic_max_event_process_time': 0.5,
     'syndic_jid_forward_cache_hwm': 100,

salt/utils/thin.py

@@ -25,6 +25,24 @@ try:
 except ImportError:
     HAS_CERTIFI = False
 
+try:
+    import singledispatch
+    HAS_SINGLEDISPATCH = True
+except ImportError:
+    HAS_SINGLEDISPATCH = False
+
+try:
+    import singledispatch_helpers
+    HAS_SINGLEDISPATCH_HELPERS = True
+except ImportError:
+    HAS_SINGLEDISPATCH_HELPERS = False
+
+try:
+    import backports_abc
+    HAS_BACKPORTS_ABC = True
+except ImportError:
+    HAS_BACKPORTS_ABC = False
+
 try:
     import markupsafe
     HAS_MARKUPSAFE = True
@@ -120,6 +138,15 @@ def gen_thin(cachedir, extra_mods='', overwrite=False, so_mods=''):
     if HAS_CERTIFI:
         tops.append(os.path.dirname(certifi.__file__))
 
+    if HAS_SINGLEDISPATCH:
+        tops.append(singledispatch.__file__.replace('.pyc', '.py'))
+
+    if HAS_SINGLEDISPATCH_HELPERS:
+        tops.append(singledispatch_helpers.__file__.replace('.pyc', '.py'))
+
+    if HAS_BACKPORTS_ABC:
+        tops.append(backports_abc.__file__.replace('.pyc', '.py'))
+
     if HAS_SSL_MATCH_HOSTNAME:
         tops.append(os.path.dirname(os.path.dirname(ssl_match_hostname.__file__)))