-
Notifications
You must be signed in to change notification settings - Fork 765
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
force-pushed
the
mergify/bp/2.6.x/pr-3784
branch
from
August 7, 2023 20:07
cec9401
to
520d2a5
Compare
EduPonz
added
ci-pending
PR which CI is running
and removed
conflicts
Backport PR wich git cherry pick failed
labels
Aug 7, 2023
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
JesusPoderoso
force-pushed
the
mergify/bp/2.6.x/pr-3784
branch
from
September 7, 2023 10:23
520d2a5
to
ab86f8f
Compare
@richiprosima please test this |
@richiprosima please test mac |
Seen apparently unrelated warnings in Mac. CI re-ordered |
@richiprosima please test mac |
1 similar comment
@richiprosima please test mac |
@EduPonz I think Mac CI error is unrelated to this PR. Can you confirm it? |
Definitely not related |
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
JesusPoderoso
approved these changes
Oct 23, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #3784 done by Mergify.
Cherry-pick of 3a83d7c has failed:
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>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com