Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Apr 25, 2025

Description

This PR forwards the notes from 2.6.10 to the supported versions

@Mergifyio backport 3.1.x 2.14.x 2.10.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • N/A Code snippets related to the added documentation have been provided.
  • N/A Documentation tests pass locally.
  • 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 #1057 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Apr 25, 2025
@mergify
Copy link
Author

mergify bot commented Apr 25, 2025

Cherry-pick of 31848c1 has failed:

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

You are currently cherry-picking commit 31848c1.
  (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.10.rst

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/notes/previous_versions/supported_versions.rst
	both modified:   docs/notes/previous_versions/v2.6.9.rst
	deleted by us:   docs/notes/previous_versions/v3.2.0.rst
	deleted by us:   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 Apr 25, 2025
6 tasks
@MiguelCompany MiguelCompany added this to the v2.10.7 - Frozen ❄️ milestone Jun 2, 2025
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL Mario-DL force-pushed the mergify/bp/2.10.x/pr-1057 branch from 143cabb to ce3ac61 Compare June 2, 2025 10:08
@Mario-DL Mario-DL requested review from Mario-DL and removed request for Mario-DL June 2, 2025 10:09
@MiguelCompany MiguelCompany self-requested a review June 2, 2025 10:10
@MiguelCompany MiguelCompany merged commit 1b75be8 into 2.10.x Jun 2, 2025
5 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.10.x/pr-1057 branch June 2, 2025 10:27
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.

3 participants