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

Merged
merged 19 commits into from Nov 12, 2018

Conversation

Projects
None yet
2 participants
@rallytime
Copy link
Contributor

commented Nov 12, 2018

Conflicts:

  • tests/support/case.py

Friedmund Lassmann and others added some commits Nov 7, 2018

Friedmund Lassmann Friedmund Lassmann
Merge pull request #50415 from flassman/pass-cwd-to-runas_system
cwd needs to be passed from runas() to runas_system()
Mike Place
Merge pull request #50414 from flassman/backmerge-for-typeerror-windo…
…ws-python3

use exc.winerror not exc[0] to avoid python3 TypeError
Merge pull request #50439 from rallytime/bootstrap-contributing-docs
Add bootstrap section to contributing docs
Fix up integration.minion.test_timeout
This test wasn't able to be run on it's own. Fix it and add more
debugging
Merge pull request #50470 from dwoz/set_time_flaky
Reset date and time after changing
Merge pull request #50469 from dwoz/minion_timeout_test
Fix up integration.minion.test_timeout
Merge pull request #50467 from dwoz/test_kitchen_up
Use patched version of test-kitchen until next upstream release
Merge branch '2017.7' into '2018.3'
Conflicts:
  - tests/support/case.py

@rallytime rallytime merged commit 360ae6a into saltstack:2018.3 Nov 12, 2018

10 checks passed

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/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details

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