Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented May 9, 2025

Description

This PR addresses issues #5790 and #5792

@Mergifyio backport 3.1.x 2.14.x 2.10.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.

  • N/A 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.
  • N/A If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • 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 #5796 done by [Mergify](https://mergify.com).

@mergify
Copy link
Contributor Author

mergify bot commented May 9, 2025

Cherry-pick of e1524ac has failed:

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

You are currently cherry-picking commit e1524ac9.
  (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/fastdds/topic/DDSSQLFilter/DDSFilterCompoundCondition.hpp
	modified:   src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterPredicate.hpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterValue.hpp
	deleted by us:   src/cpp/rtps/reader/BaseReader.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 mergify bot added the conflicts Backport PR wich git cherry pick failed label May 9, 2025
@Mario-DL Mario-DL added this to the v2.14.5 milestone May 14, 2025
@EugenioCollado EugenioCollado force-pushed the mergify/bp/2.14.x/pr-5796 branch from e112006 to 26cd1d3 Compare July 1, 2025 07:16
@EugenioCollado EugenioCollado added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Jul 1, 2025
@EugenioCollado EugenioCollado self-requested a review July 1, 2025 07:17
@EugenioCollado
Copy link
Contributor

@Mergifyio rebase 2.14.x

* Refs #23110: Add cstdint header for uint8_t

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #23110: Remove unused using

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #23110: Add missing cstdint to more headers

Signed-off-by: cferreiragonz <[email protected]>

---------

Signed-off-by: Mario Dominguez <[email protected]>
Signed-off-by: cferreiragonz <[email protected]>
Co-authored-by: cferreiragonz <[email protected]>
Signed-off-by: Eugenio Collado <[email protected]>
@mergify
Copy link
Contributor Author

mergify bot commented Jul 2, 2025

rebase 2.14.x

✅ Branch has been successfully rebased

@EugenioCollado EugenioCollado force-pushed the mergify/bp/2.14.x/pr-5796 branch from 26cd1d3 to cb4e8e9 Compare July 2, 2025 06:09
Copy link
Contributor

@EugenioCollado EugenioCollado left a comment

Choose a reason for hiding this comment

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

LGTM

@rsanchez15 rsanchez15 merged commit d2dda0f into 2.14.x Jul 2, 2025
18 of 19 checks passed
@rsanchez15 rsanchez15 deleted the mergify/bp/2.14.x/pr-5796 branch July 2, 2025 12:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci-pending PR which CI is running

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants