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

[20141] Fix TCP reconnection after open logical port failure (backport #4324)

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

This is an automatic backport of pull request #4324 done by Mergify. Cherry-pick of 3db2db893c0d59e740c5c31d05e8ed439cb71280 has failed:

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

You are currently cherry-picking commit 3db2db893.
  (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)

Changes to be committed:
	modified:   src/cpp/rtps/transport/TCPChannelResource.cpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   test/unittest/transport/TCPv4Tests.cpp
	both modified:   test/unittest/transport/TCPv6Tests.cpp
	both modified:   test/unittest/transport/mock/MockTCPv4Transport.h
	deleted by us:   test/unittest/transport/mock/MockTCPv6Transport.h

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 Feb 21 '24 20:02 mergify[bot]

@jepemi would you mind taking a look at the conflicts ? Also, take advantage to rebase, so that we have both windows & mac on github working for this branch

Mario-DL avatar Feb 23 '24 07:02 Mario-DL

  • Merge after #4414

jepemi avatar Feb 28 '24 14:02 jepemi

@jepemi next one in the loop ! Would you mind addressing the conflicts here ?

Mario-DL avatar Apr 10 '24 06:04 Mario-DL

@richiprosima please test this

Mario-DL avatar Apr 10 '24 07:04 Mario-DL