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

[17976] Correctly assign multicast port to multicast initial peers (backport #3425) #3430

Merged
merged 2 commits into from
May 12, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 3, 2023

This is an automatic backport of pull request #3425 done by Mergify.
Cherry-pick of 49baf51 has failed:

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

You are currently cherry-picking commit 49baf5154.
  (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:   test/blackbox/common/BlackboxTestsDiscovery.cpp

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

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/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

* Refs #10674. Add regression test.

Signed-off-by: Miguel Company <[email protected]>

* Refs #10674. Correctly configure multicast initial peers.

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 49baf51)

# Conflicts:
#	src/cpp/rtps/transport/UDPTransportInterface.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Apr 3, 2023
@JLBuenoLopez JLBuenoLopez added this to the v2.1.4 milestone Apr 11, 2023
@jsan-rt jsan-rt self-assigned this May 8, 2023
Signed-off-by: Javier Santiago <[email protected]>
@jsan-rt jsan-rt added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels May 8, 2023
@jsan-rt
Copy link
Contributor

jsan-rt commented May 9, 2023

@richiprosima please test windows test mac

@jsan-rt
Copy link
Contributor

jsan-rt commented May 9, 2023

Windows test failure is unrelated.

@jsan-rt jsan-rt added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. ci-pending PR which CI is running and removed ci-pending PR which CI is running ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. labels May 9, 2023
@jsan-rt
Copy link
Contributor

jsan-rt commented May 10, 2023

Linux was tested locally with no related test failures.

@jsan-rt jsan-rt added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels May 12, 2023
@EduPonz EduPonz merged commit 95da82b into 2.1.x May 12, 2023
@EduPonz EduPonz deleted the mergify/bp/2.1.x/pr-3425 branch May 12, 2023 08:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants