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

Backport proxy fixes to 2018.3 #51389

Merged
merged 1 commit into from Jan 29, 2019

Conversation

@terminalmage
Copy link
Contributor

commented Jan 29, 2019

These issues were discovered while working on PR #51204, and would affect either Salt, the test suite, or both, when the proxy service is running.

@terminalmage terminalmage changed the base branch from 2018.3 to 2018.3.4 Jan 29, 2019
@terminalmage terminalmage force-pushed the terminalmage:proxy-fixes branch from d011bd1 to ac6dfc9 Jan 29, 2019
@s0undt3ch

This comment has been minimized.

Copy link
Member

commented Jan 29, 2019

The lint error seems serious.

@terminalmage terminalmage force-pushed the terminalmage:proxy-fixes branch from ac6dfc9 to 3cec85e Jan 29, 2019
@terminalmage terminalmage requested a review from saltstack/team-core as a code owner Jan 29, 2019
@terminalmage terminalmage changed the title Backport proxy fixes to 2018.3.4 Backport proxy fixes to 2018.3 Jan 29, 2019
@terminalmage terminalmage changed the base branch from 2018.3.4 to 2018.3 Jan 29, 2019
@terminalmage terminalmage reopened this Jan 29, 2019
@terminalmage terminalmage merged commit 1438a62 into saltstack:2018.3 Jan 29, 2019
10 checks passed
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 Python lint test 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
@terminalmage terminalmage deleted the terminalmage:proxy-fixes branch Jan 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.