Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Jan 7, 2026

Description

@Mergifyio backport 3.4.x 3.3.x 3.2.x 2.14.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • N/A: Code snippets related to the added documentation have been provided.
  • Documentation tests pass locally.
  • N/A: The Pro version badge has been added if the documented feature is exclusive to Fast DDS Pro.
  • 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.
  • CI passes without warnings or errors.

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

* Refs #23085. Add notes from v2.6.11

Signed-off-by: Miguel Company <[email protected]>

* Refs #23085. Bump release in versions table.

Signed-off-by: Miguel Company <[email protected]>

* Refs #23085. Bump shapes-demo release

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 35b12f7)

# Conflicts:
#	docs/notes/previous_versions/supported_versions.rst
#	docs/notes/versions.rst
@mergify mergify bot added the conflicts label Jan 7, 2026
@mergify
Copy link
Author

mergify bot commented Jan 7, 2026

Cherry-pick of 35b12f7 has failed:

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

You are currently cherry-picking commit 35b12f7.
  (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:
	new file:   docs/notes/previous_versions/v2.6.11.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/notes/previous_versions/supported_versions.rst
	both modified:   docs/notes/versions.rst

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 mentioned this pull request Jan 7, 2026
7 tasks
@MiguelCompany MiguelCompany added this to the v2.14.6 milestone Jan 7, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants