-
Notifications
You must be signed in to change notification settings - Fork 765
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
Revert "TCP deadlock on channel reuse (#4099)" (backport #4181) #4193
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
8 tasks
EduPonz
added
skip-ci
Automatically pass CI
to-do
and removed
conflicts
Backport PR wich git cherry pick failed
labels
Jan 11, 2024
EduPonz
force-pushed
the
mergify/bp/2.11.x/pr-4181
branch
from
January 11, 2024 06:35
8755858
to
cd08995
Compare
This won't build until #4172 is merged. At that point, this PR needs a rebase |
* Revert "TCP deadlock on channel reuse (#4099)" This reverts commit dd4c434. Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20055: Separate builtin transports tests into individual cases Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20055: Mark large_data tests as flaky due to TCP Signed-off-by: EduPonz <eduardoponz@eprosima.com> --------- Signed-off-by: EduPonz <eduardoponz@eprosima.com> (cherry picked from commit 5e87eb3)
cferreiragonz
force-pushed
the
mergify/bp/2.11.x/pr-4181
branch
from
January 11, 2024 09:36
cd08995
to
b521c14
Compare
cferreiragonz
added
ci-pending
PR which CI is running
and removed
skip-ci
Automatically pass CI
to-do
needs rebase
labels
Jan 11, 2024
@richiprosima please test this |
EduPonz
approved these changes
Jan 11, 2024
@richiprosima please test mac |
@richiprosima please test mac |
@richiprosima please test mac 🥲 |
@richiprosima please test mac |
Relying on the successful mac job on #4172, which is rebased on top of this one. Other failures seem unrelated |
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 #4181 done by Mergify.
Cherry-pick of 5e87eb3 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