Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[21224] Update version support documentation (backport #4990) (backport #4995) #4997

Merged
merged 1 commit into from
Jun 25, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 25, 2024

Description

This PR is a manual backport of the changes introduced in

@Mergifyio backport 2.13.x 2.10.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • N/A 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)

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

  • N/A 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.
  • 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 #4995 done by [Mergify](https://mergify.com).

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

mergify bot commented Jun 25, 2024

Cherry-pick of 501ba8c has failed:

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

You are currently cherry-picking commit 501ba8c18.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/pull_request_template.md
	both modified:   README.md
	both modified:   RELEASE_SUPPORT.md

no changes added to commit (use "git add" and/or "git commit -a")

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

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit 501ba8c)
@JesusPoderoso JesusPoderoso added skip-ci Automatically pass CI and removed conflicts Backport PR wich git cherry pick failed labels Jun 25, 2024
@JesusPoderoso JesusPoderoso added this to the v2.10.5 milestone Jun 25, 2024
@JesusPoderoso JesusPoderoso force-pushed the mergify/bp/2.10.x/pr-4995 branch from ccd916a to f7f6363 Compare June 25, 2024 08:06
@JesusPoderoso JesusPoderoso self-requested a review June 25, 2024 08:06
Copy link
Contributor

@JesusPoderoso JesusPoderoso left a comment

Choose a reason for hiding this comment

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

LGTM

@JesusPoderoso JesusPoderoso added the ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. label Jun 25, 2024
@EduPonz EduPonz merged commit afca58f into 2.10.x Jun 25, 2024
3 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.10.x/pr-4995 branch June 25, 2024 08:08
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. skip-ci Automatically pass CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants