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.

Sign up for GitHub

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

Jump to bottom

Set a default ipv6 address for multicast #1959

Merged
merged 2 commits into from
May 14, 2021
Merged

Set a default ipv6 address for multicast #1959

merged 2 commits into from
May 14, 2021

Conversation

RFRIEDM-Trimble
Copy link
Contributor

Looks like uncrustify made some other changes into the IPLocator file.

Solves #1928

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

RFRIEDM-Trimble and others added 2 commits May 13, 2021 19:42
@RFRIEDM-Trimble
Set a good default ipv6 address
38a4bfc 
Signed-off-by: Ryan Friedman <ryan_friedman@trimble.com>
@MiguelCompany
Linters
850d031 
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
MiguelCompany
MiguelCompany approved these changes May 14, 2021
View reviewed changes
Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have fixed linters myself.
LGTM.

@MiguelCompany
Copy link
Member

@richiprosima Please test windows

@MiguelCompany
Copy link
Member

Test failures are known. Going in.

@MiguelCompany MiguelCompany merged commit 6afc1e4 into eProsima:master May 14, 2021
@MiguelCompany
Copy link
Member

@mergify backport 2.2.x 2.1.x 2.0.x

mergify bot pushed a commit that referenced this pull request May 14, 2021
@RFRIEDM-Trimble
Set a default ipv6 address for multicast (#1959)
ec6b691 
* 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
@mergify mergify bot mentioned this pull request May 14, 2021
Merged
mergify bot pushed a commit that referenced this pull request May 14, 2021
@RFRIEDM-Trimble
Set a default ipv6 address for multicast (#1959)
a05f7a9 
* 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
@mergify mergify bot mentioned this pull request May 14, 2021
Closed
mergify bot pushed a commit that referenced this pull request May 14, 2021
@RFRIEDM-Trimble
Set a default ipv6 address for multicast (#1959)
5b28b84 
* 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
@mergify mergify bot mentioned this pull request May 14, 2021
Closed
@mergify
Copy link
Contributor

mergify bot commented May 14, 2021

Command backport 2.2.x 2.1.x 2.0.x: success

Backports have been created

Hey, I reacted but my real name is @Mergifyio

MiguelCompany added a commit that referenced this pull request May 14, 2021
@mergify @RFRIEDM-Trimble @MiguelCompany
Set a default ipv6 address for multicast (#1960)
658fc2a 
* 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>
mergify bot added a commit that referenced this pull request May 14, 2021
@mergify
Set a default ipv6 address for multicast (#1960)
e26e85f 
* 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)
mergify bot added a commit that referenced this pull request May 14, 2021
@mergify
Set a default ipv6 address for multicast (#1960)
3e0b500 
* 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 pushed a commit that referenced this pull request May 15, 2021
@mergify
Set a default ipv6 address for multicast (#1966)
0bcbe14 
* 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)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
MiguelCompany pushed a commit that referenced this pull request May 15, 2021
@mergify
Set a default ipv6 address for multicast (#1965)
ea5dc5e 
* 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)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
@JLBuenoLopez JLBuenoLopez mentioned this pull request Jan 26, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MiguelCompany MiguelCompany MiguelCompany approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@RFRIEDM-Trimble @MiguelCompany