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

[auto-merge] bot-auto-merge-branch-25.02 to branch-25.04 [skip ci] [bot] #2862

Merged
merged 2 commits into from
Feb 3, 2025

Conversation

nvauto
Copy link
Collaborator

@nvauto nvauto commented Feb 3, 2025

auto-merge triggered by github actions on bot-auto-merge-branch-25.02 to create a PR keeping branch-25.04 up-to-date. If this PR is unable to be merged due to conflicts, it will remain open until manually fix.

revans2 and others added 2 commits February 3, 2025 12:47
…ptor (#2841)

This fixes NVIDIA/spark-rapids#12038

This does not fix all potential race conditions, but it does fix this
one and helps to mitigate the others a little more. But the others
should never occur in practice unless the spark worker is shutting down
in an error case already.

---------

Signed-off-by: Robert (Bobby) Evans <[email protected]>
Signed-off-by: spark-rapids automation <[email protected]>
@nvauto nvauto merged commit 13a2b8f into branch-25.04 Feb 3, 2025
@nvauto
Copy link
Collaborator Author

nvauto commented Feb 3, 2025

SUCCESS - auto-merge

@nvauto nvauto deleted the bot-auto-merge-branch-25.02 branch February 3, 2025 18:47
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.

2 participants