Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 17, 2024

Prepare Changelog for 8.15.3.

Merge once the BC that will be published is decided.


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

* docs: Prepare Changelog for 8.15.3 (#41261)

* docs: Close changelog for 8.15.3

* Update CHANGELOG.asciidoc

* Update CHANGELOG.asciidoc

* Apply suggestions from code review

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

* Apply suggestions from code review

Co-authored-by: Craig MacKenzie <[email protected]>

---------

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

# Conflicts:
#	libbeat/docs/release.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 0266410)

# Conflicts:
#	CHANGELOG.asciidoc
@mergify
Copy link
Contributor Author

mergify bot commented Oct 17, 2024

Cherry-pick of 0266410 has failed:

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

You are currently cherry-picking commit 02664106e2.
  (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
	modified:   libbeat/docs/release.asciidoc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.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 a review from a team as a code owner October 17, 2024 18:19
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 17, 2024
@mergify mergify bot requested review from faec and khushijain21 and removed request for a team October 17, 2024 18:19
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 17, 2024
@botelastic
Copy link

botelastic bot commented Oct 17, 2024

This pull request doesn't have a Team:<team> label.

@pierrehilbert pierrehilbert enabled auto-merge (squash) October 17, 2024 18:24
@pierrehilbert pierrehilbert merged commit 0dd4021 into 8.x Oct 17, 2024
@pierrehilbert pierrehilbert deleted the mergify/bp/8.x/pr-41292 branch October 17, 2024 20:07
@khushijain21 khushijain21 mentioned this pull request Jun 23, 2025
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 needs_team Indicates that the issue/PR needs a Team:* label

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants