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

[merge jam] port 50159 #58046

Merged
merged 2 commits into from Jul 29, 2020
Merged

[merge jam] port 50159 #58046

merged 2 commits into from Jul 29, 2020

Conversation

krionbsd
Copy link
Contributor

What does this PR do?

Add 2 second timeout on DNS socket check
PR 50159

Merge requirements satisfied?

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

@krionbsd krionbsd requested a review from a team as a code owner July 28, 2020 15:54
@ghost ghost requested review from dwoz and removed request for a team July 28, 2020 15:54
dwoz
dwoz approved these changes Jul 29, 2020
@dwoz dwoz merged commit 8632971 into saltstack:master Jul 29, 2020
26 checks passed
@sagetherage sagetherage added this to PR needs merge to master in PRs to port to master via automation Jul 29, 2020
@sagetherage sagetherage moved this from PR needs merge to master to PR merged in PRs to port to master Jul 29, 2020
@krionbsd krionbsd deleted the dns branch August 11, 2020 17:32
@sagetherage sagetherage added the Magnesium Mg release after Na prior to Al label Sep 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Magnesium Mg release after Na prior to Al master-port
Projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants