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

Use encoding when caching pillar data #56143

Merged
merged 2 commits into from
Mar 10, 2020

Conversation

waynew
Copy link
Contributor

@waynew waynew commented Feb 12, 2020

What does this PR do?

Uses sls encoding setting when caching pillar data (and ports #52195 to master)

What issues does this PR fix or reference?

Fixes #51854 and fixes #56121

Previous Behavior

It would always try to use str, even though the file was opened in binary mode

New Behavior

Uses the SLS_ENCODING setting when dumping yaml pillar data to cache.

Tests written?

Yes

Commits signed with GPG?

Yes

@waynew waynew requested a review from a team as a code owner February 12, 2020 16:47
@ghost ghost requested a review from cmcmarrow February 12, 2020 16:47
@waynew waynew force-pushed the 51854-minion-pillar-cache-exception branch from 074500f to 759290a Compare February 12, 2020 19:04
@sagetherage sagetherage added the v3000.1 vulnerable version label Feb 20, 2020
@twangboy
Copy link
Contributor

twangboy commented May 7, 2020

Fixes: #53943

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v3000.1 vulnerable version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

salt-minion broken after upgrade to 3000 Fluorine: minion_pillar_cache: True leads to exception
6 participants