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.

* 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
@mergify mergify bot requested a review from a team as a code owner October 17, 2024 15:38
@mergify mergify bot added the backport label Oct 17, 2024
@mergify mergify bot requested a review from belimawr October 17, 2024 15:38
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Oct 17, 2024
@mergify mergify bot requested a review from khushijain21 October 17, 2024 15:38
@mergify
Copy link
Contributor Author

mergify bot commented Oct 17, 2024

Cherry-pick of e29591e has failed:

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

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

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 17, 2024
@cla-checker-service
Copy link

❌ Author of the following commits did not sign a Contributor Agreement:
c1e8928

Please, read and sign the above mentioned agreement if you want to contribute to this project

@botelastic
Copy link

botelastic bot commented Oct 17, 2024

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

@mergify
Copy link
Contributor Author

mergify bot commented Oct 17, 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 Oct 17, 2024
@pierrehilbert pierrehilbert added the backport-8.16 Automated backport with mergify label Oct 17, 2024
@pierrehilbert pierrehilbert merged commit 0266410 into main Oct 17, 2024
@pierrehilbert pierrehilbert deleted the mergify/bp/main/pr-41261 branch October 17, 2024 18:17
mergify bot added a commit that referenced this pull request Oct 17, 2024
* 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 bot added a commit that referenced this pull request Oct 17, 2024
* 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
pierrehilbert added a commit that referenced this pull request Oct 17, 2024
…og for 8.15.3 (#41293)

* [main](backport #41261) docs: Prepare Changelog for 8.15.3 (#41292)

* 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

* Update CHANGELOG.asciidoc

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Pierre HILBERT <[email protected]>
pierrehilbert added a commit that referenced this pull request Oct 17, 2024
…g for 8.15.3 (#41294)

* [main](backport #41261) docs: Prepare Changelog for 8.15.3 (#41292)

* 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

* Update CHANGELOG.asciidoc

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Pierre HILBERT <[email protected]>
belimawr pushed a commit to belimawr/beats that referenced this pull request Oct 18, 2024
…astic#41292)

* docs: Prepare Changelog for 8.15.3 (elastic#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]>
@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 backport-8.x Automated backport to the 8.x branch with mergify backport-8.16 Automated backport with mergify 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