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

[21244] Include v2.6.9 release notes and 2.6.x maintenance flag (backport #848) #850

Merged
merged 1 commit into from
Jul 5, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 5, 2024

Description

This PR adds the previous notes from v2.6.9 and also marks the 2.6.x branches as maintenance

@Mergifyio backport 2.14.x 2.13.x 2.10.x

Contributor Checklist

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

@mergify mergify bot added the conflicts label Jul 5, 2024
Copy link
Author

mergify bot commented Jul 5, 2024

Cherry-pick of 433dc63 has failed:

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

You are currently cherry-picking commit 433dc63.
  (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.9.rst
	modified:   docs/spelling_wordlist.txt

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/notes/previous_versions/supported_versions.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

* Refs #21244: Include v2.6.9 release notes. Add maintenance flags

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

* Refs #21244: Apply Jesus suggestions

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

* Refs #21244: Update spelling wordlist

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

---------

Signed-off-by: Mario Dominguez <[email protected]>
(cherry picked from commit 433dc63)
@JesusPoderoso JesusPoderoso force-pushed the mergify/bp/2.13.x/pr-848 branch from 3a06dbe to 112467b Compare July 5, 2024 08:12
@JesusPoderoso JesusPoderoso self-requested a review July 5, 2024 08:12
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 with green CI

@JesusPoderoso JesusPoderoso added this to the v2.13.6 milestone Jul 5, 2024
@MiguelCompany MiguelCompany merged commit 2a77b80 into 2.13.x Jul 5, 2024
4 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.13.x/pr-848 branch July 5, 2024 09:06
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