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

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

Merged
merged 1 commit into from
Mar 12, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 22, 2024

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

On branch mergify/bp/2.10.x/pr-4396
Your branch is up to date with 'origin/2.10.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 mergify bot added the conflicts Backport PR wich git cherry pick failed label Feb 22, 2024
@JesusPoderoso JesusPoderoso added this to the v2.10.4 milestone Feb 22, 2024
@cferreiragonz cferreiragonz changed the base branch from 2.10.x to mergify/bp/2.10.x/pr-4324 March 4, 2024 07:55
@cferreiragonz
Copy link
Contributor

@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 labels Mar 4, 2024
Base automatically changed from mergify/bp/2.10.x/pr-4324 to 2.10.x March 11, 2024 19:30
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
@cferreiragonz cferreiragonz removed the temporarily-blocked PR must be merged after another one label Mar 12, 2024
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany
Copy link
Member

@richiprosima please test mac

@MiguelCompany MiguelCompany merged commit 6dc23dd into 2.10.x Mar 12, 2024
10 of 15 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.10.x/pr-4396 branch March 12, 2024 19:20
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