-
Notifications
You must be signed in to change notification settings - Fork 778
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
[20239] Make DataWriters always send the key hash on keyed topics (backport #4238) #4353
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
JesusPoderoso
added
ci-pending
PR which CI is running
and removed
conflicts
Backport PR wich git cherry pick failed
labels
Feb 2, 2024
@richiprosima please test this |
Just as a reminder for me |
@Mergifyio rebase 2.6.x |
* Refs #20239: Add regression test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Fix Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Change some assert logic in DDSStatus tests since now, a not null instancehandle should be expected Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20239: Apply rev suggestions Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> (cherry picked from commit 4d8c489) # Conflicts: # test/blackbox/common/DDSBlackboxTestsListeners.cpp
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
EduPonz
force-pushed
the
mergify/bp/2.6.x/pr-4238
branch
from
March 4, 2024 19:10
33658ab
to
022354f
Compare
✅ Branch has been successfully rebased |
@richiprosima please test this |
Mario-DL
approved these changes
Mar 5, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM lets wait for another mac ci run before giving it as ready to merge
Mario-DL
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
Mar 6, 2024
This was referenced Mar 7, 2024
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 #4238 done by Mergify.
Cherry-pick of 4d8c489 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/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