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 #50538 into 2019.2 #51221

Merged
merged 3 commits into from Jan 18, 2019

Conversation

@Ch3LL
Copy link
Contributor

commented Jan 17, 2019

Backport #50538 into 2019.2

conflicts:

  • salt/modules/pdbedit.py
@sjorge
sjorge approved these changes Jan 17, 2019
Copy link
Contributor

left a comment

LGTM, although I did spot one thing that could make this more robust.

user_data[label] = data

if user_data:
users[user_data['unix username']] = user_data

This comment has been minimized.

Copy link
@sjorge

sjorge Jan 17, 2019

Contributor

This probably also applies to what we currently have in develop branch too...

We should probably also check if we actually have ‘unix username’ instead of assuming we do. (See line 100)

@garethgreenaway garethgreenaway merged commit 0ccd5c3 into saltstack:2019.2 Jan 18, 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
3 participants
You can’t perform that action at this time.