Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 1, 2025

What is the problem this PR solves?

These updates will (1) eliminate any manual steps in the resulting fleet-server release notes PR outside of copy edits, and (2) reduce the chance of conflicts when forward porting to later minors and main (like we ran into in in elastic-agent in elastic/elastic-agent#10032 and elastic/elastic-agent#10031).

How does this PR solve the problem?

Reorganizes the release-notes/_snippets file structure to be compatible with elastic/elastic-agent-changelog-tool#220.

How to test this PR locally

There will be a docs preview.

Related issues

elastic/elastic-agent-changelog-tool#220

cc @karenzone


This is an automatic backport of pull request #5565 done by Mergify.

(cherry picked from commit a02bf19)

# Conflicts:
#	changelog/9.0.7/breaking-changes.md
#	docs/release-notes/_snippets/9.1.0/breaking-changes.md
#	docs/release-notes/_snippets/9.1.1/breaking-changes.md
#	docs/release-notes/_snippets/9.1.2/breaking-changes.md
#	docs/release-notes/_snippets/9.1.3/breaking-changes.md
#	docs/release-notes/_snippets/9.1.4/breaking-changes.md
#	docs/release-notes/_snippets/breaking-changes.md
#	docs/release-notes/_snippets/deprecations.md
#	docs/release-notes/_snippets/index.md
@mergify mergify bot requested a review from a team as a code owner October 1, 2025 17:34
@mergify mergify bot added the backport label Oct 1, 2025
@mergify mergify bot requested a review from a team as a code owner October 1, 2025 17:34
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Oct 1, 2025
@mergify mergify bot requested a review from ycombinator October 1, 2025 17:34
@mergify mergify bot added the backport label Oct 1, 2025
@mergify mergify bot requested a review from pchila October 1, 2025 17:34
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Oct 1, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Oct 1, 2025

Cherry-pick of a02bf19 has failed:

On branch mergify/bp/9.0/pr-5565
Your branch is up to date with 'origin/9.0'.

You are currently cherry-picking commit a02bf19.
  (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:
	renamed:    docs/release-notes/_snippets/9.0.0/breaking.md -> docs/release-notes/_snippets/9.0.0/breaking-changes.md
	renamed:    docs/release-notes/_snippets/9.0.1/breaking.md -> docs/release-notes/_snippets/9.0.1/breaking-changes.md
	renamed:    docs/release-notes/_snippets/9.0.2/breaking.md -> docs/release-notes/_snippets/9.0.2/breaking-changes.md
	renamed:    docs/release-notes/_snippets/9.0.3/breaking.md -> docs/release-notes/_snippets/9.0.3/breaking-changes.md
	renamed:    docs/release-notes/_snippets/9.0.4/breaking.md -> docs/release-notes/_snippets/9.0.4/breaking-changes.md
	renamed:    docs/release-notes/_snippets/9.0.5/breaking.md -> docs/release-notes/_snippets/9.0.5/breaking-changes.md
	renamed:    docs/release-notes/_snippets/9.0.6/breaking.md -> docs/release-notes/_snippets/9.0.6/breaking-changes.md
	new file:   docs/release-notes/_snippets/breaking-changes/9.0.md
	new file:   docs/release-notes/_snippets/breaking-changes/9.1.md
	new file:   docs/release-notes/_snippets/deprecations/9.0.md
	new file:   docs/release-notes/_snippets/deprecations/9.1.md
	new file:   docs/release-notes/_snippets/index/9.0.md
	new file:   docs/release-notes/_snippets/index/9.1.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   changelog/9.0.7/breaking-changes.md
	deleted by us:   docs/release-notes/_snippets/9.1.0/breaking-changes.md
	deleted by us:   docs/release-notes/_snippets/9.1.1/breaking-changes.md
	deleted by us:   docs/release-notes/_snippets/9.1.2/breaking-changes.md
	deleted by us:   docs/release-notes/_snippets/9.1.3/breaking-changes.md
	deleted by us:   docs/release-notes/_snippets/9.1.4/breaking-changes.md
	both modified:   docs/release-notes/_snippets/breaking-changes.md
	both modified:   docs/release-notes/_snippets/deprecations.md
	both modified:   docs/release-notes/_snippets/index.md

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

@prodsecmachine
Copy link

prodsecmachine commented Oct 1, 2025

🎉 Snyk checks have passed. No issues have been found so far.

security/snyk check is complete. No issues have been found. (View Details)

license/snyk check is complete. No issues have been found. (View Details)

@github-actions github-actions bot added documentation Improvements or additions to documentation docs Team:Docs Label for the Observability docs team skip-changelog labels Oct 1, 2025
@colleenmcginnis colleenmcginnis enabled auto-merge (squash) October 1, 2025 18:11
@colleenmcginnis colleenmcginnis merged commit c1f4fcb into 9.0 Oct 2, 2025
11 checks passed
@colleenmcginnis colleenmcginnis deleted the mergify/bp/9.0/pr-5565 branch October 2, 2025 13:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request docs documentation Improvements or additions to documentation skip-changelog Team:Docs Label for the Observability docs team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants