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 matcher grain file #50308

Merged
merged 1 commit into from Oct 30, 2018

Conversation

Projects
None yet
1 participant
@rallytime
Copy link
Contributor

commented Oct 30, 2018

What does this PR do?

This was inadvertently changed in the filename_map backport.

This commit restores the matcher grain file to match all branches previous to the inadvertent change.

This PR fixes the 2 tests that are currently failing on the 2018.3 branch:

  • integration.loader.test_ext_grains.LoaderGrainsTest.test_grains_overwrite
  • integration.shell.test_matcher.MatchTest.test_grai

What issues does this PR fix or reference?

Refs #50182 and #50050

Tests written?

No - fixes test failures

Commits signed with GPG?

Yes

Please review Salt's Contributing Guide for best practices.

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

Fix matcher grain file
This was inadvertently changed in th filename_map backport.

This commit restores the matcher grain file to match all branches previous
to the inadvertent change.

@rallytime rallytime merged commit b805bab into saltstack:2018.3 Oct 30, 2018

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 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/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

@rallytime rallytime deleted the rallytime:test-fixes branch Oct 30, 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.