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 #48799

Merged
merged 18 commits into from Jul 27, 2018

Conversation

Projects
None yet
4 participants
@rallytime
Contributor

rallytime commented Jul 27, 2018

No conflicts.

zer0def and others added some commits Jul 24, 2018

Merge pull request #48749 from Ch3LL/logo_docs
Update Saltstack Logo banner on docs.saltstack.com
Merge pull request #48731 from zer0def/virt-runner-init-args
Fixed `enable_vnc` runner arg being passed into `seed_cmd` module arg in `virt.init`.
Threshold was wrong
I also removed the delta value check. It's going to be weird with the
number of runs we do, and it's also set to run on failures.
Update linting docs to contain .testing.pylintrc use
The PR tests use the ``.testing.pylintrc`` file, rather than the
more restrictive ``.pylintrc`` file. This can be a point of confusion
when following the current documentation.

The docs should reference the testing file and that the Jenkins PR
tests use ``.testing.pylintrc`` instead of ``.pylintrc``.

Fixes #48417
Merge pull request #48795 from rallytime/fix-48417
Update linting docs to contain .testing.pylintrc use
Merge pull request #48742 from frogunder/45014
add windows integration tests for states.file

@rallytime rallytime changed the base branch from develop to 2018.3 Jul 27, 2018

@rallytime rallytime merged commit fae29f4 into saltstack:2018.3 Jul 27, 2018

4 of 8 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-centos-7 The py2-centos-7 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
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-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details

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

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