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

Setting vendor_id on received CacheChange_t [21214] (backport #4978) #5030

Merged
merged 1 commit into from
Jul 10, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 4, 2024

Description

MessageReceiver is setting the vendor _id for all RTPS submessages but for Data and DataFrag. This PR sets the vendor_id for this last submessages.

@Mergifyio backport 2.14.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • The code follows the style guidelines of this project.

  • N/A Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally

  • N/A Any new/modified methods have been properly documented using Doxygen.

  • N/A Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • Changes are API compatible.

  • New feature has been added to the versions.md file (if applicable).

  • N/A New feature has been documented/Current behavior is correctly described in the documentation.

  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #4978 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jul 4, 2024
Copy link
Contributor Author

mergify bot commented Jul 4, 2024

Cherry-pick of 6c051ae has failed:

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

You are currently cherry-picking commit 6c051ae17.
  (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/MessageReceiver.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   versions.md

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

@EduPonz EduPonz added this to the v2.14.3 milestone Jul 4, 2024
* Refs #21213. Setting vendor_id on received CacheChange_t

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #21213. Add info to versions.md

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #21213. Restore submodule

Signed-off-by: Ricardo González Moreno <[email protected]>

---------

Signed-off-by: Ricardo González Moreno <[email protected]>
(cherry picked from commit 6c051ae)

Signed-off-by: eduponz <[email protected]>
@EduPonz EduPonz force-pushed the mergify/bp/2.14.x/pr-4978 branch from 495ea92 to c280137 Compare July 9, 2024 08:23
@EduPonz EduPonz removed the conflicts Backport PR wich git cherry pick failed label Jul 9, 2024
@EduPonz EduPonz self-requested a review July 9, 2024 08:23
@github-actions github-actions bot added the ci-pending PR which CI is running label Jul 9, 2024
Copy link
Member

@EduPonz EduPonz left a comment

Choose a reason for hiding this comment

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

LGTM with green CI

@EduPonz EduPonz 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 Jul 10, 2024
@EduPonz EduPonz merged commit 13f3003 into 2.14.x Jul 10, 2024
17 of 18 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.14.x/pr-4978 branch July 10, 2024 05:06
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.

None yet

2 participants