[develop] Merge forward from 2016.3 to develop #34052
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Because the hook is run as the user performing the push, salt-call will typically fail. This documentation change uses sudo for salt-call, and provides a sudo policy that permits any user to run the post-recieve hook.
…ation attributes 'return_config' and 'return_kwargs'. They are specified as 'return_config' and 'return_kwargs' in the documentation, and those are the member names used elsewhere in the code base. However, this code previously referenced 'returner_kwargs' and 'returner_config', so returners from scheduled jobs were not appropriately called in situations in which configuration parameters to override default minion config needed to be provided to the schedule module. Resolves issue saltstack#33868 (saltstack#33868).
- Removed the GetConnection call as all this does is cause connections that are connected with the overrides for "CERTIFICATE_VERIFY_FAILED" to not be able to connect the 2nd time the si is fetched
Add base argument to salt-ssh grains wrapper for filter_by func
Back-port saltstack#33698 to 2015.8
* Initial debugging * Replace the old child jid tracking with psutil investigation of children * Remove debugging
No conflicts.
…ule-returner-config utils/schedule.py:handle_func() - Fix for accessing returner configur…
[2016.3] Merge forward from 2015.8 to 2016.3
Removes the "Full list of builtin ..." from each module reference list, leaving just the module type for scanability. Refs saltstack#12470 Refs saltstack#10206 Refs saltstack#10480 Refs saltstack#23522 Refs saltstack#33023
Call `sys.exit()` instead of `exit()`
Use full path to python.exe
Document sudo policy for gitfs post-recieve hook
Understanding Jinja topic, Jinja doc issues.
…ed string for `privileges`
…tgres_privileges-doc-priv-list `states.postgres_privileges` expects a real list, not a comma-separated string
Clean up installation instructions code-block type updates Add link to jinja tutorial
Updated latest release to 2016.3.1
[2016.3] Merge forward from 2015.8 to 2016.3
Conflicts: - salt/modules/win_pkg.py - salt/states/disk.py
This was referenced Jun 15, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Conflicts: