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 fix issue50254 #50366

Merged
merged 4 commits into from Nov 20, 2018

Conversation

Projects
None yet
2 participants
@t0fik
Copy link
Contributor

commented Nov 2, 2018

Fix for #50254

Tests: YES

@t0fik t0fik referenced this pull request Nov 2, 2018

Closed

Fix of issue #50254 #50367

@dwoz dwoz self-requested a review Nov 3, 2018

@dwoz

This comment has been minimized.

Copy link
Contributor

commented Nov 13, 2018

I plan to review this sometime this week. I am mainly wondering what happens in the case where the file starts on a linux master and ends up on a windows minion.

@t0fik

This comment has been minimized.

Copy link
Contributor Author

commented Nov 13, 2018

@dwoz Nothing will happen. Line endings are probed from modified file.

@dwoz

dwoz approved these changes Nov 20, 2018

@dwoz dwoz merged commit 60b4622 into saltstack:2018.3 Nov 20, 2018

8 of 10 checks passed

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