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

Added some more docs for master and minion config settings #33292

Merged
merged 2 commits into from
May 17, 2016

Conversation

rallytime
Copy link
Contributor

Configs addressed:

  • auth_safemode
  • auth_timeout
  • conf_file
  • gather_job_timeout
  • jinja_lstrip_blocks
  • jinja_trim_blocks
  • max_event_size

Refs #32400

Configs addressed:
  - auth_safemode
  - auth_timeout
  - conf_file
  - gather_job_timeout
  - jinja_lstrip_blocks
  - jinja_trim_blocks
  - max_event_size
Default: ``False``

If authentication fails due to SaltReqTimeoutError during a ping_interval,
this setting, when set to ``True``, will cause a sub minion process to
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sub-minion

@cachedout cachedout merged commit 9b42a05 into saltstack:2015.5 May 17, 2016
@rallytime rallytime deleted the doc-configs branch May 17, 2016 17:07
gitebra pushed a commit to gitebra/salt that referenced this pull request May 18, 2016
* upstream/develop: (23 commits)
  Don't merge-forward the change to salt/scripts.py
  Cleanup comments in smbios.get output (fixes saltstack#33266) (saltstack#33306)
  Back-port saltstack#32993 to 2016.3 (saltstack#33304)
  Fix iptables --match-set (saltstack#23643) (saltstack#33314)
  Improve package verification documentation
  Accept verify_options and ignore_types as a comma-separated list
  Fix minion start retry on Windows (2016.3) (saltstack#33285)
  update 2015.8.9 release notes (saltstack#33310)
  Added some more docs for master and minion config settings (saltstack#33292)
  linux_acl: Allow '-' as a separation character in ACL permissions. Fixes saltstack#31270 (saltstack#33172) (saltstack#33305)
  Server Density agentv2 support (saltstack#32772) (saltstack#33303)
  man pages updated (saltstack#33307)
  Fix iptables --match-set (saltstack#23643) (saltstack#33301)
  Handle more ipv6 error as an exception saltstack#33299 (saltstack#33300)
  Ignore retcode when checking service's status (saltstack#33294)
  fix "loose" typo (saltstack#33290)
  Fix minion start retry on Windows
  Add auth_tries config option to minion.rst docs (saltstack#33287)
  Document new master and minion config opts for 2016.3.0
  Document minion_id_caching config value (saltstack#33282)
  ...
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