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

[3006.x] Update formatters and code to avoid merge-forward conflicts #66147

Merged
merged 6 commits into from Feb 29, 2024

Conversation

s0undt3ch
Copy link
Member

What does this PR do?

See title

@s0undt3ch s0undt3ch self-assigned this Feb 27, 2024
@s0undt3ch s0undt3ch requested a review from a team as a code owner February 27, 2024 11:16
@s0undt3ch s0undt3ch requested review from dwoz and removed request for a team February 27, 2024 11:16
@salt-project-bot-prod-environment salt-project-bot-prod-environment bot changed the title Update formatters and code to avoid merge-forward conflicts [3006.x] Update formatters and code to avoid merge-forward conflicts Feb 27, 2024
twangboy
twangboy previously approved these changes Feb 27, 2024
tests/pytests/functional/pillar/test_gpg.py Show resolved Hide resolved
@s0undt3ch s0undt3ch merged commit fcb38a5 into saltstack:3006.x Feb 29, 2024
766 checks passed
@s0undt3ch s0undt3ch deleted the hotfix/poetry-3006.x branch February 29, 2024 10:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants