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 2017.7 to 2018.3 #50214

Merged
merged 22 commits into from Oct 25, 2018

Conversation

Projects
None yet
8 participants
@rallytime
Copy link
Contributor

commented Oct 24, 2018

No conflicts.

terminalmage and others added some commits Aug 24, 2018

Adjust jenkins linting process, only run stage if required, use git d…
…iff to find files, instead of find, report on status, changed and deleted files, lint only changed files.
Merge pull request #50158 from vutny/doc/2017.7/fix-http-tutorial
[DOC] Fix JSON payload example in HTTP tutorial
Mike Place
Merge pull request #50180 from max-arnold/2017.7
Revert curly braces example for nested dictionaries
Merge pull request #50205 from Ch3LL/rn_2017.7.8
[2017.7.8] remove in progress and add security details
Merge pull request #50207 from Ch3LL/2update_version_doc_2017.7
 Update release versions for the 2017.7 branch
Nicolas Chancereul
Do not fail if process already ended
We can expect the subprocess has already ended by the time we're
checking for child processes. Handle this case gracefully so that tests
do not fail with an exception.
Merge pull request #50212 from dwoz/test_no_fail
Do not fail if process already ended
Merge pull request #50211 from channias/fix-spm-modules-install
Fix broken install of additionnal modules in SPM packages
Merge pull request #50202 from Ch3LL/_2017.7.8
[2017.7] Ensure that tokens are hex to avoid hanging/errors in cherrypy

@rallytime rallytime merged commit 9ea51c0 into saltstack:2018.3 Oct 25, 2018

5 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has failed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
WIP Ready for review
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

@rallytime rallytime deleted the rallytime:merge-2018.3 branch Oct 25, 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.