Fix merge order of options in run_wfunc (fix mine.get issues) #41025
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
This fix issues with mine.get when using salt-ssh
What issues does this PR fix or reference?
#36796
Previous Behavior
pillar.Pillar() is called with options where master_opts options are overwritten (because of dict merge/update order).
New Behavior
pillar.Pillar() is called with options where master_opts take precedence. This allow mine.get over salt-ssh to work properly.
Tests written?
No
Please review Salt's Contributing Guide for best practices.