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 419bcc8fad409ecaf44c22346d650bf8f6d4290f..1dcc065639a0de3f9ec323697fb50cb2ee8a5e98 100644 (file)
--- 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