[2016.3] Merge forward from 2015.8 to 2016.3 #33508
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
…33414) * Fix the saltutil.wheel function and add integration tests Fixes saltstack#32446 * Provide a more useful message when command is run on non-local minion
The examples given in the config did not match the code. Adjusted code to line up with examples.
Make sure to run the account sections of pam.d directives. Closes saltstack#32455
…signature-2015.8 check the RPM signature of zypper pkg.download packages and report errors
Correct (and make consistent) determination of the test flag.
This is not a valid argument for any of the supported pkgrepo platforms, and having it pass through to pkg.expand_repo_def results in a traceback.
Make doc formatting consistent and use correct versionadded
Back-port saltstack#32484 to 2015.8
…docstring right now.
fix jobs.list_jobs failing with search_target
Add docs for the syndic_finger config
states.service: minor doc updates
Add pillar_opts docs to master.rst
Document the postgres.psql_query function
Fix docs about etcd config options and add pillar_opts doc
Add docstring examples to glance.py and nova.py [2015.8]
…uccessfully-2015.8 jobs.exit_success allow to check if a job has executed and exit successfully
Fix diskusage beacon
Add docstring examples to glance.py [2015.5]
Add docs about minion config file in standalone minion docs
Conflicts: - doc/ref/configuration/master.rst - doc/ref/configuration/minion.rst
[2015.8] Merge forward from 2015.5 to 2015.8
Conflicts: - salt/beacons/__init__.py - salt/modules/saltutil.py - salt/modules/zypper.py - salt/states/grains.py - salt/states/pkgrepo.py - salt/states/service.py
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: