[3007.x] Merge forward 3006.x into 3007.x #67002
Open
+670
−304
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
Add logging and convert to formatted string literal. Other Yum options uses equal sign as separator but setopt separator is irregular using space as separator. Fix: saltstack#66970
Not a valid argument for this function, remove misleading documentation reference. Signed-off-by: Georg Pfuetzenreuter <[email protected]>
A pillars dict in a minion node definition was not overridding correctly the same dict in classes. * salt/utils/saltclass.py (expanded_dict_from_minion): do not pass a reference to minion dict or it will be overridden by classes during expansion. Fixes: saltstack#63933
This was introduced by saltstack#66517 `__invocation_jid` is rewriten to `_State__invocation_id`, making `cls(**init_kwargs)` fail with a TypeError (unexpected argument `__invocation_jid` (this behavior is called name mangling).
This ensures dunders like __env__ are defined in states running in parallel on spawning platforms. The __running__ dict can contain salt.utils.process.Process instances, which are still picklable.
salt-project-bot-prod-environment
bot
changed the title
dmurphy18
approved these changes
Oct 25, 2024
twangboy
approved these changes
Oct 25, 2024
dwoz
force-pushed
the
merge/3007.x/3006.x
branch
from
e7cab6a
to
1a83476
Compare
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.
see title