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

[20239] Make DataWriters always send the key hash on keyed topics (backport #4238) #4353

Merged
merged 2 commits into from
Mar 6, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 2, 2024

This is an automatic backport of pull request #4238 done by Mergify.
Cherry-pick of 4d8c489 has failed:

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

You are currently cherry-picking commit 4d8c4893f.
  (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:   src/cpp/rtps/messages/submessages/DataMsg.hpp
	modified:   test/blackbox/common/BlackboxTestsKeys.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/blackbox/common/DDSBlackboxTestsListeners.cpp

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> 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 Feb 2, 2024
@JesusPoderoso JesusPoderoso added this to the v2.6.8 milestone Feb 2, 2024
@JesusPoderoso JesusPoderoso added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Feb 2, 2024
@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

@Mario-DL
Copy link
Member

Mario-DL commented Feb 23, 2024

Just as a reminder for me
Before asking for ci here, we need to w8 for #4308 to be merged and rebase first

@EduPonz
Copy link

EduPonz commented Mar 4, 2024

@Mergifyio rebase 2.6.x

Mario-DL and others added 2 commits March 4, 2024 19:10
* 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>
Copy link
Contributor Author

mergify bot commented Mar 4, 2024

rebase 2.6.x

✅ Branch has been successfully rebased

@EduPonz
Copy link

EduPonz commented Mar 4, 2024

@richiprosima please test this

Copy link
Member

@Mario-DL Mario-DL left a 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 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
@EduPonz EduPonz merged commit 14c5289 into 2.6.x Mar 6, 2024
10 of 17 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-4238 branch March 6, 2024 09:51
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.

3 participants