Fast-DDS icon indicating copy to clipboard operation
Fast-DDS copied to clipboard

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

Open mergify[bot] opened this issue 1 year ago • 3 comments

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

On branch mergify/bp/2.6.x/pr-4527
Your branch is up to date with 'origin/2.6.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[bot] avatar Mar 08 '24 08:03 mergify[bot]

Cherry-pick of 08193d5f7eb4dcf3de8ecee3725f57bee28d35cd has failed:

On branch mergify/bp/2.6.x/pr-4527
Your branch is up to date with 'origin/2.6.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[bot] avatar Mar 08 '24 08:03 mergify[bot]

  • Merge after: https://github.com/eProsima/Fast-DDS/pull/4513

cferreiragonz avatar Mar 08 '24 13:03 cferreiragonz

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

cferreiragonz avatar Apr 04 '24 13:04 cferreiragonz

@cferreiragonz could you take a look at the conflicts here ? We are finally unblocked for merging this PR !

Mario-DL avatar May 27 '24 10:05 Mario-DL

@richiprosima please test this

Mario-DL avatar May 28 '24 09:05 Mario-DL