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

[2019.2] Make sure ldap attrs are string types on python 2 #51964

Merged
merged 4 commits into from Mar 5, 2019

Conversation

@dwoz
Copy link
Contributor

commented Mar 4, 2019

What does this PR do?

Add optional default to the _config method in the pillar_ldap module. This ensures default values are converted to string types on python 2.

Fixes issue #51816

Tests written?

Yes

Commits signed with GPG?

Yes

dwoz added 2 commits Mar 4, 2019
@dwoz dwoz requested a review from saltstack/team-core as a code owner Mar 4, 2019
@waynew
waynew approved these changes Mar 4, 2019
Copy link
Contributor

left a comment

Looks good 👍

@dwoz dwoz merged commit c310022 into saltstack:2019.2 Mar 5, 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
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.