Skip to content

Commit

Permalink
minion: master_alive_interval: remove duplicate (saltstack-formulas#369)
Browse files Browse the repository at this point in the history
Remove commented version and associated comment, as we still have the same
option earlier in config with an other valid comment.
  • Loading branch information
ze42 authored and ixs committed Jul 22, 2018
1 parent fc4e504 commit 639e7ff
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions salt/files/minion.d/f_defaults.conf
Original file line number Diff line number Diff line change
Expand Up @@ -464,12 +464,6 @@ schedule:
# minion event bus. The value is expressed in bytes.
{{ get_config('max_event_size', '1048576') }}

# To detect failed master(s) and fire events on connect/disconnect, set
# master_alive_interval to the number of seconds to poll the masters for
# connection events.
#
#{{ get_config('master_alive_interval', '30') }}

# The minion can include configuration from other files. To enable this,
# pass a list of paths to this option. The paths can be either relative or
# absolute; if relative, they are considered to be relative to the directory
Expand Down

0 comments on commit 639e7ff

Please sign in to comment.