[2017.7] Merge forward from 2016.11 to 2017.7 #42363
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
…sing the user parameter
Restrict set_umask to mkstemp call only
…ask is preserved when we grab the file.
When a command is being executed using salt.utils.timed_subprocess.TimedProc, and that command does not exist in the PATH, it will result in an OSError/IOError being raised. We catch this and then raise a CommandExecutionError with some information, including the command being run. However, when output_loglevel=quiet, we don't want any details of the command to be visible. This commit redacts the command details in these corner cases.
This can be used with debug logging enabled to troubleshoot which registries this function is attempting to authenticate.
Update builds available for rc1
…nc is spelled consistently
Fix docs for puppet.plugin_sync
Back-port saltstack#42097 to 2016.11
Back-port saltstack#42098 to 2016.11
Fix kerberos create_keytab doc
Fix saltstack#42115: parse libcloud "rc" version correctly
Prevent command from showing in exception when output_loglevel=quiet
Fix pillar.get when saltenv is passed
Fix regression in CLI pillar override for salt-call
No conflicts.
Fixes this exception:
An exception occurred in this state: Traceback (most recent call last):
File "/var/tmp/.syops_b1274f_salt/py2/salt/state.py", line 1733, in call
**cdata['kwargs'])
File "/var/tmp/.syops_b1274f_salt/py2/salt/loader.py", line 1652, in wrapper
return f(*args, **kwargs)
File "/var/tmp/.syops_b1274f_salt/py2/salt/states/gpg.py", line 119, in present
ret['comment'].append('Adding {0} to GPG keychain'.format(name))
AttributeError: 'str' object has no attribute 'append'
Back-port saltstack#42224 to 2016.11
Some minor doc fixes for dnsutil module so they'll render correctly
DOCS: describe importing custom util classes
Emptying the password was only done if the user already existed, not when creating. Signed-off-by: Nicolas Geniteau <nicolas@cri.epita.net>
This allows a version of 'latest' to work when just a name and version is passed.
Multiple empty_password fixes for state.user
…dentity_files_with_user Fixes to modules/git.py
Add clarification to salt ssh docs about key auto-generation.
…windows Force file removal on Windows. Fixes saltstack#42295
Handle libcloud objects that throw RepresenterErrors with --out=yaml
Add some clarity to "multiple quotes" section of yaml docs
pkg.installed: pack name/version into pkgs argument
Update minion restart section in FAQ doc for windows
While not fatal, this could potentially cause problems running this test on Windows.
is_windows is a function, not a propery/attribute
Conflicts: - salt/grains/core.py - salt/modules/git.py - salt/modules/pillar.py - salt/states/saltmod.py - salt/states/user.py - tests/integration/states/handle_iorder.py
|
Go Go Jenkins! |
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: