-
Notifications
You must be signed in to change notification settings - Fork 791
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
[20599] Protect asio exception hotfix (backport #4527) #4532
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
Cherry-pick of 08193d5 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 |
10 tasks
cferreiragonz
force-pushed
the
mergify/bp/2.10.x/pr-4527
branch
2 times, most recently
from
March 11, 2024 15:27
8e58d69
to
65e7bc1
Compare
cferreiragonz
added
ci-pending
PR which CI is running
temporarily-blocked
PR must be merged after another one
and removed
conflicts
Backport PR wich git cherry pick failed
needs rebase
labels
Mar 11, 2024
cferreiragonz
force-pushed
the
mergify/bp/2.10.x/pr-4527
branch
from
March 11, 2024 15:32
65e7bc1
to
f994380
Compare
cferreiragonz
force-pushed
the
mergify/bp/2.10.x/pr-4300
branch
from
March 12, 2024 07:54
1c7fda0
to
c3c072b
Compare
jepemi
force-pushed
the
mergify/bp/2.10.x/pr-4300
branch
from
March 13, 2024 07:27
c3c072b
to
15e5e47
Compare
MiguelCompany
force-pushed
the
mergify/bp/2.10.x/pr-4300
branch
from
March 14, 2024 06:54
15e5e47
to
8e7ff80
Compare
@jepemi Could you please rebase this to fix the conflicts ? |
* Refs #20599: Handle error code before function call Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> * Apply suggestion Co-authored-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 08193d5) # Conflicts: # src/cpp/rtps/transport/TCPTransportInterface.cpp
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
cferreiragonz
force-pushed
the
mergify/bp/2.10.x/pr-4527
branch
from
March 15, 2024 12:17
f994380
to
95d07ca
Compare
cferreiragonz
removed
the
temporarily-blocked
PR must be merged after another one
label
Mar 15, 2024
MiguelCompany
approved these changes
Mar 15, 2024
@richiprosima Please test this |
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 #4527 done by Mergify.
Cherry-pick of 08193d5 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