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

[20438] LARGE_DATA Participants logic with same listening ports (backport #4396)

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

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

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

You are currently cherry-picking commit 3ff918061.
  (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
	both modified:   test/unittest/transport/TCPv4Tests.cpp
	both modified:   test/unittest/transport/TCPv6Tests.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 Feb 22 '24 14:02 mergify[bot]

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

cferreiragonz avatar Mar 04 '24 08:03 cferreiragonz

@richiprosima please test this

elianalf avatar Mar 18 '24 13:03 elianalf