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

Fix file.comment state picks up comments after config in line #62122

Merged
merged 2 commits into from
May 31, 2022

Conversation

nicholasmhughes
Copy link
Collaborator

What does this PR do?

See issue referenced below and comment in #62045 for details.

What issues does this PR fix or reference?

Fixes: #62121

Previous Behavior

Uncommented lines with a comment later in the line would not be commented as expected.

New Behavior

Comments are inserted as expected when the line has a later comment after the config.

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

Commits signed with GPG?

Yes

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

@nicholasmhughes nicholasmhughes requested a review from a team as a code owner May 31, 2022 00:52
@nicholasmhughes nicholasmhughes requested review from dwoz and removed request for a team May 31, 2022 00:52
@nicholasmhughes nicholasmhughes added the Phosphorus v3005.0 Release code name and version label May 31, 2022
@nicholasmhughes nicholasmhughes force-pushed the fix-file-comment-62121 branch from a20174c to a121693 Compare May 31, 2022 10:43
@nicholasmhughes nicholasmhughes force-pushed the fix-file-comment-62121 branch from a121693 to c348e82 Compare May 31, 2022 10:43
@nicholasmhughes
Copy link
Collaborator Author

re-run pr-freebsd-131-amd64-py3-pytest

@Ch3LL Ch3LL merged commit 8e233b3 into saltstack:master May 31, 2022
@nicholasmhughes nicholasmhughes deleted the fix-file-comment-62121 branch June 1, 2022 00:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Phosphorus v3005.0 Release code name and version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] file.comment state picks up comments after config in the line
2 participants