committing changes in /etc after apt run

Package changes:
-salt-common 2016.3.4+ds-1
-salt-minion 2016.3.4+ds-1
+salt-common 2016.11.0+ds-1
+salt-minion 2016.11.0+ds-1
-tzdata 2016i-0+deb8u1
+tzdata 2016j-0+deb8u1

diff --git a/.etckeeper b/.etckeeper
index c1112652e1fc44ecc55a2b722312df84e7582265..6760ace177761c7f5d2602afe0c59ef35900bc0e 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -25,6 +25,7 @@ mkdir -p './network/interfaces.d'
 mkdir -p './opt'
 mkdir -p './perl/CPAN'
 mkdir -p './salt/minion.d'
+mkdir -p './salt/proxy.d'
 mkdir -p './security/limits.d'
 mkdir -p './security/namespace.d'
 mkdir -p './ssl/private'
@@ -594,6 +595,7 @@ maybe chmod 0700 'salt/pki/minion'
 maybe chmod 0400 'salt/pki/minion/minion.pem'
 maybe chmod 0644 'salt/pki/minion/minion.pub'
 maybe chmod 0644 'salt/proxy'
+maybe chmod 0755 'salt/proxy.d'
 maybe chmod 0644 'securetty'
 maybe chmod 0755 'security'
 maybe chmod 0644 'security/access.conf'

diff --git a/salt/proxy b/salt/proxy
index 4e5cc3452cda59e28cd6e2b63bcad6081fcaba20..bfd43588492db8222af65823fedd84dc83437c7d 100644 (file)
--- a/salt/proxy
+++ b/salt/proxy
@@ -28,7 +28,7 @@
 # dictionary.  Otherwise it is assumed that the module calls the grains
 # function in a custom way and returns the data elsewhere
 #
-# Default to False for 2016.3 and Carbon.  Switch to True for Nitrogen.
+# Default to False for 2016.3 and 2016.11.  Switch to True for Nitrogen.
 # proxy_merge_grains_in_module: False
 
 # If multiple masters are specified in the 'master' setting, the default behavior
@@ -443,6 +443,9 @@
 # WARNING: While md5 and sha1 are also supported, do not use it due to the high chance
 # of possible collisions and thus security breach.
 #
+# WARNING: While md5 is also supported, do not use it due to the high chance
+# of possible collisions and thus security breach.
+#
 # Warning: Prior to changing this value, the minion should be stopped and all
 # Salt caches should be cleared.
 #hash_type: sha256
@@ -553,7 +556,7 @@
 #log_fmt_console: '%(colorlevel)s %(colormsg)s'
 #log_fmt_console: '[%(levelname)-8s] %(message)s'
 #
-#log_fmt_logfile: '%(asctime)s,%(msecs)03.0f [%(name)-17s][%(levelname)-8s] %(message)s'
+#log_fmt_logfile: '%(asctime)s,%(msecs)03d [%(name)-17s][%(levelname)-8s] %(message)s'
 
 # This can be used to control logging levels more specificically.  This
 # example sets the main salt library at the 'warning' level, but sets