Fix pillar include regression #52490
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hm... does this make https://github.com/saltstack/salt/pull/52008/files irrelevant? Or is this change for a different problem? |
|
@waynew Looks like this is a separate issue. I think we should merge this change into your PR. |
|
The thing I'm most concerned about is that this PR is removing the matched_pstates (or changing it to assignment rather than .extend) |
|
@waynew okay, I'll take a look at it again. |
|
@waynew I took a look at this again and everything still looks right to me. Is there a test we can write that would confirm there is or is not an issue? Or would you like me to merge this into your change so you can test it? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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?
Fixes #52134
Wild card include issue #22063
Previous Behavior
Including from multiple files stomped on pillar key
New Behavior
Fixes key stomping regression
Tests written?
Yes
Commits signed with GPG?
Yes