-
Notifications
You must be signed in to change notification settings - Fork 793
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
[20179] TCP unique client announced local port (backport #4216) #4287
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 tasks
JesusPoderoso
added
ci-pending
PR which CI is running
and removed
conflicts
Backport PR wich git cherry pick failed
labels
Jan 24, 2024
jepemi
force-pushed
the
mergify/bp/2.6.x/pr-4216
branch
from
January 24, 2024 12:06
82369c2
to
0786256
Compare
@richiprosima plase test this |
@jepemi would you mind rebasing here as well ? |
jepemi
force-pushed
the
mergify/bp/2.6.x/pr-4216
branch
from
February 23, 2024 12:12
0786256
to
869217d
Compare
@jepemi would you mind rebasing over |
* Refs #20179: Guarantee unique announced client local port Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Regression tests Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Prevent from join() deadlock (ReceiverResource mtx taken) Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Uncrustify Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Fix windows release tests Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Apply sugestions Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Uncrustify Signed-off-by: Jesus Perez <jesusperez@eprosima.com> --------- Signed-off-by: Jesus Perez <jesusperez@eprosima.com> (cherry picked from commit b43f3a0) # Conflicts: # src/cpp/rtps/transport/TCPTransportInterface.cpp # src/cpp/rtps/transport/TCPTransportInterface.h # test/unittest/transport/TCPv6Tests.cpp
Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
jepemi
force-pushed
the
mergify/bp/2.6.x/pr-4216
branch
from
March 7, 2024 09:27
869217d
to
8c1bfe5
Compare
@richiprosima please test this |
Mario-DL
approved these changes
Mar 8, 2024
Thread sanitizer passed but got stuck at the post-setup ccache step. Windows github v141 runs on flaky tests but jenkins correctly addressed them. Mac jenkins failed tests are unrelated. Ready to merge |
Mario-DL
added
ready-to-merge
Ready to be merged. CI and changes have been reviewed and approved.
and removed
ci-pending
PR which CI is running
labels
Mar 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #4216 done by Mergify.
Cherry-pick of b43f3a0 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refresh
will re-evaluate the rules@Mergifyio rebase
will rebase this PR on its base branch@Mergifyio update
will merge the base branch into this PR@Mergifyio backport <destination>
will backport this PR on<destination>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com