Skip to content
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 2018.3.3 to 2018.3 #49406

Merged
merged 25 commits into from Aug 30, 2018

Conversation

Projects
None yet
6 participants
@rallytime
Copy link
Contributor

commented Aug 29, 2018

Conflicts:

  • salt/utils/timed_subprocess.py
  • tests/integration/states/test_file.py

terminalmage and others added some commits Aug 21, 2018

Allow compound matching in eauth config expressions
When we try to match the configured expression, we look for a match type
(e.g. `I@`, `G@`, etc.) at the beginning, and when we don't find one we
were falling back to a glob. This changes the fallback to compound so
that we can support compound matches. Note that the compound matching
engine will act just like the glob match engine when the host passed to
it is a single minion ID glob, so using compound as the fallback gets
you glob matching for free.
Merge pull request #49323 from Ch3LL/skip_git
Skip nonexistent branch test for git versions <1.7.10
upgrade including linux kernels
This is required for ubuntu 14.04 to pass.
Remove unicode filenames on windows python 2
Need to provide unicode to shutil in order to retrieve and delete
unicode.
file state test fixes
- fix integration.states.test_file.FileTest.test_managed_latin1_diff
- fix integration.states.test_file.FileTest.test_recurse_issue_40578
- fix some issues integration.states.test_file.FileTest.test_issue_8947_utf8_sls,
  this test still fails due to py2 popen's unicode handling.
Skip grep unit tests on windows
These tests are specific to unix like platforms that have grep
installed. On windows we use the win_file module.
Revert newline translation change
On windows, newlines will be CRLF since we added unix2dos to kitchen.
Add async helper to test_sock_path_len
This test function is causing another test:

unit.utils.test_event.TestAsyncEventPublisher.test_event_subscription

To fail with 'Async operation timed out after 5 seconds', Adding the
tornado Async test helper so that both tests pass.
Encode shell commands explicitly.
On Windows subprocess.Popen will try to implicity encode shell commands
using the default system encoding. This will raise an exception if
passed utf-8.
Merge branch '2018.3.3' into '2018.3'
Conflicts:
  - salt/utils/timed_subprocess.py
  - tests/integration/states/test_file.py
@cachedout

This comment has been minimized.

Copy link
Collaborator

commented Aug 29, 2018

@rallytime I'm confused. There were conflicts in two files but I don't see them in the changes.

@rallytime

This comment has been minimized.

Copy link
Contributor Author

commented Aug 30, 2018

@cachedout That's because there were indeed conflicts, but on both of those files I needed to take the HEAD of 2018.3, so no changes would show up.

@rallytime rallytime merged commit 7f8c38a into saltstack:2018.3 Aug 30, 2018

7 of 8 checks passed

jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has failed
Details
WIP ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Aug 30, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.