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

x509 module and state bug fixes #49561

Merged
merged 6 commits into from Sep 11, 2018

Conversation

Projects
None yet
4 participants
@dwoz
Copy link
Contributor

commented Sep 7, 2018

What does this PR do?

  • Fix issues in fileserver.roots on Windows
  • Add regression test and fix issues found for #49027. Note, I was unable to reproduce the error from #49027 but found these issue in the file module just trying to get this test to pass.
  • Add regression test and fix issue for #49008. Fixes in the x509 module and state, I've also created a merge request for M2Crypto to fix part of the issue upstream.

What issues does this PR fix or reference?

#49027, #49008

Tests written?

Yes

Commits signed with GPG?

Yes

dwoz added some commits Sep 7, 2018

Fix map file loading on windows
Prevent exceptions on windows from lines trying to be decoded/encoded to
ascii
Fix multiple issues in x509 module and state
Adding a regression test for #49008 and patching the x509 module and
state to make the test pass.
@isbm

isbm approved these changes Sep 11, 2018

@rallytime rallytime merged commit 283e7d7 into saltstack:2018.3 Sep 11, 2018

4 of 10 checks passed

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

@dwoz dwoz deleted the dwoz:m2crypto_test branch Sep 17, 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.