-
Notifications
You must be signed in to change notification settings - Fork 778
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
[20141] Fix TCP reconnection after open logical port failure (backport #4324) #4420
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
11 tasks
jepemi
force-pushed
the
mergify/bp/2.12.x/pr-4324
branch
from
March 1, 2024 13:14
35132c9
to
aa3d320
Compare
jepemi
added
ci-pending
PR which CI is running
and removed
conflicts
Backport PR wich git cherry pick failed
labels
Mar 1, 2024
cferreiragonz
force-pushed
the
mergify/bp/2.12.x/pr-4297
branch
from
March 12, 2024 08:31
74d1ea0
to
b8cc3ac
Compare
jepemi
force-pushed
the
mergify/bp/2.12.x/pr-4324
branch
from
March 13, 2024 15:25
b25e917
to
300bc5a
Compare
cferreiragonz
removed
the
temporarily-blocked
PR must be merged after another one
label
Mar 13, 2024
@richiprosima please test this |
elianalf
added
ready-to-merge
Ready to be merged. CI and changes have been reviewed and approved.
and removed
ready-to-merge
Ready to be merged. CI and changes have been reviewed and approved.
labels
Mar 14, 2024
elianalf
force-pushed
the
mergify/bp/2.12.x/pr-4324
branch
from
March 14, 2024 09:01
300bc5a
to
3513f71
Compare
elianalf
force-pushed
the
mergify/bp/2.12.x/pr-4324
branch
from
March 14, 2024 15:52
660b604
to
8807dbf
Compare
* Refs #20141: Relocate pending ports erasing Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20141: Add test Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20141: Uncrustify Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20141: Fix asan tests Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20141: Changes after rebase Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20141: Fix windows tests Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20141: Uncrustify Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20141: Apply suggestions Signed-off-by: Jesus Perez <jesusperez@eprosima.com> --------- Signed-off-by: Jesus Perez <jesusperez@eprosima.com> (cherry picked from commit 3db2db8)
Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
elianalf
force-pushed
the
mergify/bp/2.12.x/pr-4324
branch
from
March 18, 2024 07:02
8807dbf
to
669fe26
Compare
@richiprosima please test this |
elianalf
approved these changes
Mar 18, 2024
elianalf
added
the
ready-to-merge
Ready to be merged. CI and changes have been reviewed and approved.
label
Mar 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
ci-pending
PR which CI is running
ready-to-merge
Ready to be merged. CI and changes have been reviewed and approved.
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 #4324 done by Mergify.
Cherry-pick of 3db2db8 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/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