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

[2018.3] Merge forward from 2017.7 to 2018.3 #48487

Merged
merged 24 commits into from Jul 9, 2018

Conversation

Projects
None yet
9 participants
@rallytime
Contributor

rallytime commented Jul 9, 2018

Conflicts:

  • pkg/windows/req.txt
  • salt/netapi/rest_tornado/saltnado.py
  • salt/utils/versions.py
  • tests/integration/states/test_file.py

garethgreenaway and others added some commits Jul 1, 2018

Setting the mode with setuid or setgid bits in addition to setting th…
…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.
Fix outputter detection in jobs.lookup_jid runner
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.
Merge pull request #48432 from dwoz/file-prepend-again
Prepend test needs file.touch method
Fix issue with redismod.hmset method
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
Found another issue with redismod.hmset
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.
Merge pull request #48428 from terminalmage/fix-jobs.lookup_jid
Fix outputter detection in jobs.lookup_jid runner
Merge pull request #48433 from discogestalt/fix-redis.hmset
Fix issue with redismod.hmset method
Merge pull request #48471 from gtmanfred/2017.7
Add some configurations to tox
Merge pull request #48399 from garethgreenaway/48336_2017_7_ensure_ch…
…mod_setuid_with_chown

[2017.7] fixes to module/file.py
use tox to run pylint
Also allow pylint to be run from a virtualenv
Fix dependencies
Adds back libnacl
Adds back libsodium.dll
Adds new python-certifi-win32
Merge pull request #48472 from gtmanfred/2017.7
use tox to run pylint
Merge branch '2017.7' into '2018.3'
Conflicts:
  - pkg/windows/req.txt
  - salt/netapi/rest_tornado/saltnado.py
  - salt/utils/versions.py
  - tests/integration/states/test_file.py

@rallytime rallytime merged commit fc3eeef into saltstack:2018.3 Jul 9, 2018

6 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #24220 — FAILURE
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #11262 — FAILURE
Details
default Build started sha1 is merged.
Details
WIP ready for review
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #26504 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #18538 — SUCCESS
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #6292 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #23174 — SUCCESS
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #20345 — SUCCESS
Details

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Jul 9, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment