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

[CP #1551 > support/v5.12] [core] Updated udpcap to 2.0.1 (deadlock fix) #1552

Merged
merged 1 commit into from
Apr 22, 2024

Conversation

eclipse-ecal-bot
Copy link
Contributor

Cherry-pick failed

Cherry-picked PR #1551 to branch support/v5.12.
The cherry-pick has failed.

The following files have caused conflicts:

thirdparty/udpcap/udpcap
thirdparty/udpcap~HEAD

Resolving

Please resolve conflicts manually. You can use this PR and branch to your convenience.

git fetch origin
git checkout -b local/cherry-pick/a003676/support/v5.12 origin/support/v5.12
git branch -u origin/cherry-pick/a003676/support/v5.12
git cherry-pick 5ecb809107a27788f4e51b60da5aef6eef24400b..a003676ed93d17fa7adc2214058c58c0ebcfd6da

# Resolve conflicts and use
#     git cherry-pick --continue
# until all conflicts are resolved.

git push -f origin HEAD:cherry-pick/a003676/support/v5.12

After resolving all conflicts, rebase-merge this PR.

@FlorianReimold FlorianReimold force-pushed the cherry-pick/a003676/support/v5.12 branch from 52e8bba to 966fe7c Compare April 22, 2024 06:59
@FlorianReimold FlorianReimold added the Auto Approve Request Automatic PR Approval label Apr 22, 2024
@FlorianReimold FlorianReimold marked this pull request as ready for review April 22, 2024 07:49
@FlorianReimold FlorianReimold merged commit 26ce5bf into support/v5.12 Apr 22, 2024
16 checks passed
@FlorianReimold FlorianReimold deleted the cherry-pick/a003676/support/v5.12 branch April 26, 2024 12:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants