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

[main](backport #41771) docs: Prepare Changelog for 8.15.5 #41785

Merged
merged 3 commits into from
Nov 26, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 26, 2024

Prepare Changelog for 8.15.5.

Merge once the BC that will be published is decided.


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

* docs: Close changelog for 8.15.5

* Update CHANGELOG.asciidoc

* Update CHANGELOG.asciidoc

Co-authored-by: David Kilfoyle <[email protected]>

* Update CHANGELOG.asciidoc

---------

Co-authored-by: elasticmachine <[email protected]>
Co-authored-by: Pierre HILBERT <[email protected]>
Co-authored-by: David Kilfoyle <[email protected]>
(cherry picked from commit b215a4a)

# Conflicts:
#	CHANGELOG.asciidoc
#	libbeat/docs/release.asciidoc
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 26, 2024
@mergify mergify bot requested a review from a team as a code owner November 26, 2024 09:50
Copy link
Contributor Author

mergify bot commented Nov 26, 2024

Cherry-pick of b215a4a has failed:

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

You are currently cherry-picking commit b215a4a367.
  (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:
	modified:   CHANGELOG.next.asciidoc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.asciidoc
	both modified:   libbeat/docs/release.asciidoc

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 requested review from mauri870 and khushijain21 November 26, 2024 09:50
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 26, 2024
Copy link
Contributor Author

mergify bot commented Nov 26, 2024

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Nov 26, 2024
@pierrehilbert pierrehilbert enabled auto-merge (squash) November 26, 2024 09:58
@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Nov 26, 2024
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Nov 26, 2024
@pierrehilbert
Copy link
Collaborator

run docs-build

@pierrehilbert pierrehilbert merged commit 368335c into main Nov 26, 2024
142 checks passed
@pierrehilbert pierrehilbert deleted the mergify/bp/main/pr-41771 branch November 26, 2024 13:35
mergify bot added a commit that referenced this pull request Nov 26, 2024
* docs: Prepare Changelog for 8.15.5 (#41771)

* docs: Close changelog for 8.15.5

* Update CHANGELOG.asciidoc

* Update CHANGELOG.asciidoc

Co-authored-by: David Kilfoyle <[email protected]>

* Update CHANGELOG.asciidoc

---------

Co-authored-by: elasticmachine <[email protected]>
Co-authored-by: Pierre HILBERT <[email protected]>
Co-authored-by: David Kilfoyle <[email protected]>
(cherry picked from commit b215a4a)

# Conflicts:
#	CHANGELOG.asciidoc
#	libbeat/docs/release.asciidoc

* Update CHANGELOG.asciidoc

* Update release.asciidoc

---------

Co-authored-by: elastic-vault-github-plugin-prod[bot] <150874479+elastic-vault-github-plugin-prod[bot]@users.noreply.github.com>
Co-authored-by: Pierre HILBERT <[email protected]>
(cherry picked from commit 368335c)
pierrehilbert pushed a commit that referenced this pull request Nov 26, 2024
…41792)

* docs: Prepare Changelog for 8.15.5 (#41771)

* docs: Close changelog for 8.15.5

* Update CHANGELOG.asciidoc

* Update CHANGELOG.asciidoc

Co-authored-by: David Kilfoyle <[email protected]>

* Update CHANGELOG.asciidoc

---------

Co-authored-by: elasticmachine <[email protected]>
Co-authored-by: Pierre HILBERT <[email protected]>
Co-authored-by: David Kilfoyle <[email protected]>
(cherry picked from commit b215a4a)

# Conflicts:
#	CHANGELOG.asciidoc
#	libbeat/docs/release.asciidoc

* Update CHANGELOG.asciidoc

* Update release.asciidoc

---------

Co-authored-by: elastic-vault-github-plugin-prod[bot] <150874479+elastic-vault-github-plugin-prod[bot]@users.noreply.github.com>
Co-authored-by: Pierre HILBERT <[email protected]>
(cherry picked from commit 368335c)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport backport-8.x Automated backport to the 8.x branch with mergify conflicts There is a conflict in the backported pull request Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants