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.

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

Conversation

ze42
Copy link
Contributor

@ze42 ze42 commented Jun 8, 2018

No description provided.

@ze42
Copy link
Contributor Author

ze42 commented Jun 8, 2018

The following master_alive_interval line is also, and still present at line 98.

{{ get_config('master_alive_interval', '30') }}

@ze42
Copy link
Contributor Author

ze42 commented Jun 8, 2018

same as #368 but also removing the associated comment.

@aboe76
Copy link
Member

aboe76 commented Jun 8, 2018

@ze42 can you rebase

Remove commented version and associated comment, as we still have the same
option earlier in config with an other valid comment.
@ze42 ze42 force-pushed the remove_duplicate_master_alive_interval branch from ef7833f to 568bf54 Compare June 11, 2018 08:10
@ze42
Copy link
Contributor Author

ze42 commented Jun 11, 2018

@aboe76 properly rebased.

@aboe76 aboe76 merged commit 2761d90 into saltstack-formulas:master Jun 11, 2018
@aboe76
Copy link
Member

aboe76 commented Jun 11, 2018

@ze42 thanks for this

ixs pushed a commit to bawuenet/salt-formula that referenced this pull request Jul 22, 2018
Remove commented version and associated comment, as we still have the same
option earlier in config with an other valid comment.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants