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

Set a default ipv6 address for multicast (backport #1959) (backport #1960) #1965

Merged
merged 1 commit into from
May 15, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 14, 2021

This is an automatic backport of pull request #1960 done by Mergify.


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.io/

* Set a default ipv6 address for multicast (#1959)

* Set a good default ipv6 address

Signed-off-by: Ryan Friedman <ryan_friedman@trimble.com>

* Linters

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 6afc1e4)

# Conflicts:
#	src/cpp/rtps/transport/UDPv6Transport.cpp

* Fixed merge conflicts

Co-authored-by: RFRIEDM_Trimble <50461358+RFRIEDM-Trimble@users.noreply.github.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 658fc2a)
@MiguelCompany
Copy link
Member

Failures unrelated to IPv6

@MiguelCompany MiguelCompany merged commit ea5dc5e into 2.1.x May 15, 2021
@MiguelCompany MiguelCompany deleted the mergify/bp/2.1.x/pr-1960 branch May 15, 2021 06:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant