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

[19347] Fix encapsulation format in WLP (backport #3784) #3790

Merged
merged 2 commits into from
Oct 24, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 7, 2023

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

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

You are currently cherry-picking commit 3a83d7c61.
  (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:   include/fastdds/rtps/builtin/liveliness/WLPListener.h
	modified:   include/fastdds/rtps/common/CDRMessage_t.h
	modified:   include/fastdds/rtps/common/SerializedPayload.h
	modified:   include/fastdds/rtps/messages/CDRMessage.h
	modified:   include/fastdds/rtps/messages/CDRMessage.hpp
	modified:   src/cpp/rtps/builtin/liveliness/WLP.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/builtin/liveliness/WLPListener.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

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Aug 7, 2023
@mergify mergify bot mentioned this pull request Aug 7, 2023
11 tasks
* Refs #19347: Fix encapsulation format in WLP. Improve WLP checks

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Correctly set CDR endianess for BE

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Uncrustify

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Fix doxygen

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Apply suggestions

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Fix Windows warning

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Apply suggestions

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Correct condition when setting the payload encapsulation

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Remove legacy typedef

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Initialize uint32_t variable

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
(cherry picked from commit 3a83d7c)

# Conflicts:
#	src/cpp/rtps/builtin/liveliness/WLPListener.cpp
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
@EduPonz EduPonz added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Aug 7, 2023
@EduPonz EduPonz added this to the v2.6.7 milestone Aug 7, 2023
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

2 similar comments
@JLBuenoLopez
Copy link
Contributor

@richiprosima please test this

@EduPonz
Copy link

EduPonz commented Oct 3, 2023

@richiprosima please test this

@EduPonz
Copy link

EduPonz commented Oct 3, 2023

@richiprosima please test mac

2 similar comments
@EduPonz
Copy link

EduPonz commented Oct 3, 2023

@richiprosima please test mac

@Mario-DL
Copy link
Member

Mario-DL commented Oct 9, 2023

@richiprosima please test mac

@Mario-DL
Copy link
Member

Mario-DL commented Oct 9, 2023

Seen apparently unrelated warnings in Mac. CI re-ordered

@Mario-DL
Copy link
Member

@richiprosima please test mac

1 similar comment
@JesusPoderoso
Copy link
Contributor

@richiprosima please test mac

@JesusPoderoso
Copy link
Contributor

@EduPonz I think Mac CI error is unrelated to this PR. Can you confirm it?

@EduPonz
Copy link

EduPonz commented Oct 23, 2023

@EduPonz I think Mac CI error is unrelated to this PR. Can you confirm it?

Definitely not related

@JesusPoderoso JesusPoderoso 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 Oct 23, 2023
@EduPonz EduPonz merged commit df6eecb into 2.6.x Oct 24, 2023
7 of 8 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-3784 branch October 24, 2023 10:29
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