saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Note proxy_merge_grains_in_module

Browse source
This commit is contained in:
Mircea Ulinic 2017-03-23 14:15:13 +00:00
parent 5919d612b2
commit a0a2f60961
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/topics/proxyminion/index.rst
View file

@ -39,6 +39,9 @@ with easy configuration and management of ``salt-proxy`` processes.
New in Nitrogen
---------------
The :conf_proxy:`proxy_merge_grains_in_module` configuration variable
introduced in 2016.3, has been changed, defaulting to ``True``.
The connection with the remote device is kept alive by default, when the
module implements the ``alive`` function and :conf_proxy:`proxy_keep_alive`
is set to ``True``. The polling interval is set using the