Merge forward from 3004.1 #61888
Merged
Merge forward from 3004.1 #61888
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
This was introduced in 26fcda5 Fixes saltstack#60391 Fixes saltstack#60963
Restored the previously shifted check for version_to_remove in old[target]. This had been extracted along with the correctly extracted double pkg_params[target] lookup, but that lost the `target in old` guard. Putting the check back here prevents KeyError when looking for a non-existent target in `old`.
…ed functions to return changes when test=True.
s0undt3ch
previously approved these changes
Mar 31, 2022
|
Test failures look related though. |
Fix broken channel tests by populating an AES key and serial.
waynew
previously approved these changes
Mar 31, 2022
twangboy
previously approved these changes
Apr 13, 2022
twangboy
approved these changes
Apr 13, 2022
twangboy
previously approved these changes
Apr 13, 2022
twangboy
approved these changes
Apr 15, 2022
s0undt3ch
approved these changes
Apr 16, 2022
garethgreenaway
approved these changes
Apr 18, 2022
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?
Merge CVE changes from 3004.1 into master.
What issues does this PR fix or reference?
Fixes: #61871
Previous Behavior
Remove this section if not relevant
New Behavior
Remove this section if not relevant
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes/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.