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

[3007.x] Merge 3006.x into 3007.x #66160

Merged

Conversation

s0undt3ch
Copy link
Collaborator

What does this PR do?

See title

twangboy and others added 30 commits February 21, 2024 12:18
…cript

[3006.x] Fix update winrepo script on 3006.x
This reverts commit 21ebbf1.
The problem is that the tornado we ship is not prepared for Python 3.12,
and it imports `ssl` and checks if the `match_hostname` function is defined, which
has been deprecated since Python 3.7, so, the logic goes into trying to import
backports.ssl-match-hostname which is not installed on the system.
Added the check to a few other places in channel server
@s0undt3ch s0undt3ch force-pushed the hotfix/merge-forward-into-3007.x branch from 9c87498 to 128ff9a Compare March 6, 2024 12:40
@s0undt3ch s0undt3ch force-pushed the hotfix/merge-forward-into-3007.x branch from 128ff9a to c336cdb Compare March 6, 2024 12:41
@s0undt3ch s0undt3ch merged commit 4fda1a8 into saltstack:3007.x Mar 7, 2024
804 checks passed
@s0undt3ch s0undt3ch deleted the hotfix/merge-forward-into-3007.x branch March 7, 2024 09:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
test:full Run the full test suite test:pkg Run the package tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants