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

Merge pull request #32339 from Ch3LL/fix_doc_multi-master

Browse source 
remove reference to master_alive_check in 2015.5
This commit is contained in:
Mike Place 2016-04-04 14:39:24 -06:00
commit 8578089beb
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/topics/highavailability/index.rst
View file

@ -30,11 +30,11 @@ Multimaster with Failover
Changing the ``master_type`` parameter from ``str`` to ``failover`` will
cause minions to connect to the first responding master in the list of masters.
Every ``master_alive_check`` seconds the minions will check to make sure
Every ``master_alive_interval`` seconds the minions will check to make sure
the current master is still responding. If the master does not respond,
the minion will attempt to connect to the next master in the list. If the
minion runs out of masters, the list will be recycled in case dead masters
have been restored. Note that ``master_alive_check`` must be present in the
have been restored. Note that ``master_alive_interval`` must be present in the
minion configuration, or else the recurring job to check master status
will not get scheduled.