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

[20599] Protect asio exception hotfix (backport #4527) #4532

Merged
merged 2 commits into from
Mar 18, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 8, 2024

This is an automatic backport of pull request #4527 done by Mergify.
Cherry-pick of 08193d5 has failed:

On branch mergify/bp/2.10.x/pr-4527
Your branch is up to date with 'origin/2.10.x'.

You are currently cherry-picking commit 08193d5f7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/transport/TCPTransportInterface.cpp

no changes added to commit (use "git add" and/or "git commit -a")

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> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Mar 8, 2024
Copy link
Contributor Author

mergify bot commented Mar 8, 2024

Cherry-pick of 08193d5 has failed:

On branch mergify/bp/2.10.x/pr-4527
Your branch is up to date with 'origin/2.10.x'.

You are currently cherry-picking commit 08193d5f7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/transport/TCPTransportInterface.cpp

no changes added to commit (use "git add" and/or "git commit -a")

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 mergify bot mentioned this pull request Mar 8, 2024
10 tasks
@JesusPoderoso JesusPoderoso added this to the v2.10.4 milestone Mar 8, 2024
@cferreiragonz
Copy link
Contributor

@cferreiragonz cferreiragonz changed the base branch from 2.10.x to mergify/bp/2.10.x/pr-4300 March 11, 2024 14:44
@cferreiragonz cferreiragonz force-pushed the mergify/bp/2.10.x/pr-4527 branch 2 times, most recently from 8e58d69 to 65e7bc1 Compare March 11, 2024 15:27
@cferreiragonz 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
Copy link
Contributor

This PR also backports features of #4319 and some features of #4300 that could not be backported in #4512 because of the missing features of #4319.

Base automatically changed from mergify/bp/2.10.x/pr-4300 to 2.10.x March 15, 2024 12:11
@MiguelCompany
Copy link
Member

@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 cferreiragonz removed the temporarily-blocked PR must be merged after another one label Mar 15, 2024
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany MiguelCompany merged commit 6f39dc2 into 2.10.x Mar 18, 2024
9 of 15 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.10.x/pr-4527 branch March 18, 2024 13:23
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants