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

Fix aix grains test for prtconf present #49961

Merged
merged 1 commit into from Oct 10, 2018

Conversation

Projects
None yet
2 participants
@dmurphy18
Copy link
Contributor

commented Oct 10, 2018

What does this PR do?

Corrects test for presence of utility prtconf on AIX systems.

What issues does this PR fix or reference?

The Salt 2018.3.3 point release was patched for this fix, this PR adds the fix to upstream

Previous Behavior

The error was in code added for the 2018.3.3 release, not present in earlier versions of Salt.

New Behavior

Adds fix to upstream from Salt 2018.3.3 point release patch.

Tests written?

No, fix was tested during build/package process for Salt 2018.3.3

Commits signed with GPG?

No

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

David Murphy

@rallytime rallytime merged commit 1c2e5be into saltstack:2018.3 Oct 10, 2018

7 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
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
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.