[2018.3] Merge forward from 2017.7 to 2018.3 #48487
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
…e owner and group will force the setuid & setgid bits to reset. This change ensures that we set the mode after setting the owner & group.
The outputter detection was always failing because `data` is the return from the `jobs.list_job` runner, which has an extra dictionary level at the top.
Prepend test needs file.touch method
Back-port saltstack#46824 to 2017.7
redis.StrictRedis.hmset expects a dict as its second arg.
hmset(self, name, mapping) method of redis.client.StrictRedis instance
Set key to value within hash ``name`` for each corresponding
key and value from the ``mapping`` dict
When run with salt.function in an orchestration, several private key/value pairs are passed in addition to the requested pairs: 127.0.0.1:6379> hkeys testing 1) "__pub_arg" 2) "field1" 3) "__pub_jid" 4) "__pub_fun" 5) "field2" 6) "field3" 7) "__pub_tgt" 8) "__pub_ret" 9) "__pub_user" 10) "__pub_master_id" 11) "__pub_tgt_type" Updated to filter them.
Fix outputter detection in jobs.lookup_jid runner
Fix issue with redismod.hmset method
Add some configurations to tox
…ensure_chmod_setuid_with_chown [2017.7] fixes to module/file.py
Also allow pylint to be run from a virtualenv
Adds back libnacl Adds back libsodium.dll Adds new python-certifi-win32
Fix dependencies
use tox to run pylint
Conflicts: - pkg/windows/req.txt - salt/netapi/rest_tornado/saltnado.py - salt/utils/versions.py - tests/integration/states/test_file.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: