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

Merged
merged 5 commits into from Oct 22, 2018

Conversation

Projects
None yet
5 participants
@rallytime
Copy link
Contributor

commented Oct 22, 2018

No conflicts.

KaiSforza and others added some commits Oct 10, 2018

Increase centos7-py2 kitchen pr timeout to 8 hours
The centos7-py2 tests have been consistently failing to finish before
the timeout. I am increasing the timeout for these tests to 8 hours in
order to see if we can finish a few of them. They should get much closer
to finishing as the branch tests have been finishing at around the 6:30
or 7:00 mark sometimes.
Mike Place
Merge pull request #50144 from dwoz/winrm_fs_release
Use newest winrm-fs release

@cachedout cachedout merged commit 5c7a7d9 into saltstack:2018.3 Oct 22, 2018

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