Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

minion: master_alive_interval: remove duplicate #369

Merged
merged 1 commit into from
Jun 11, 2018
Merged

minion: master_alive_interval: remove duplicate #369

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions salt/files/minion.d/f_defaults.conf
View file
Open in desktop
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