From: Frank Brehm <frank@brehm-online.com>
Date: Wed, 26 Apr 2017 21:04:28 +0000 (+0200)
Subject: committing changes in /etc after apt run
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=f5cc76dfccb9594ccd2b1c64b9742ee16ba9d953;p=config%2Fns1%2Fetc.git

committing changes in /etc after apt run

Package changes:
-libmysqlclient18 5.5.54-0+deb8u1
+libmysqlclient18 5.5.55-0+deb8u1
-mysql-common 5.5.54-0+deb8u1
+mysql-common 5.5.55-0+deb8u1
-salt-common 2016.11.3+ds-1
-salt-minion 2016.11.3+ds-1
+salt-common 2016.11.4+ds-1
+salt-minion 2016.11.4+ds-1
---

diff --git a/salt/minion b/salt/minion
index 419bcc8..1dcc065 100644
--- a/salt/minion
+++ b/salt/minion
@@ -647,6 +647,10 @@
 ###########################################
 # Disable multiprocessing support, by default when a minion receives a
 # publication a new process is spawned and the command is executed therein.
+#
+# WARNING: Disabling multiprocessing may result in substantial slowdowns
+# when processing large pillars. See https://github.com/saltstack/salt/issues/38758
+# for a full explanation.
 #multiprocessing: True
 
 
@@ -731,6 +735,10 @@
 #
 #zmq_monitor: False
 
+# Number of times to try to authenticate with the salt master when reconnecting
+# to the master
+#tcp_authentication_retries: 5
+
 ######      Module configuration      #####
 ###########################################
 # Salt allows for modules to be passed arbitrary configuration data, any data