Skip to content

Comments

[main](backport #43740) docs: Prepare Changelog for 8.18.0#43928

Merged
pierrehilbert merged 2 commits intomainfrom
mergify/bp/main/pr-43740
Apr 23, 2025
Merged

[main](backport #43740) docs: Prepare Changelog for 8.18.0#43928
pierrehilbert merged 2 commits intomainfrom
mergify/bp/main/pr-43740

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 15, 2025

Prepare Changelog for 8.18.0.

Merge once the BC that will be published is decided.

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

@elastic-vault-github-plugin-prod @mergify
docs: Prepare Changelog for 8.18.0 (#43740)
6b44286 
* docs: Close changelog for 8.18.0

* Fix typos and formatting in CHANGELOG.

* Update CHANGELOG with Filebeat changes

---------

Co-authored-by: elasticmachine <elasticmachine@elastic.co>
Co-authored-by: Pierre HILBERT <pierre.hilbert@elastic.co>
Co-authored-by: Eric Beahan <eric.beahan@elastic.co>
(cherry picked from commit ae869d2)

# Conflicts:
#	CHANGELOG.asciidoc
#	libbeat/docs/release.asciidoc
@mergify mergify bot requested a review from a team as a code owner April 15, 2025 14:03
@mergify mergify bot requested review from AndersonQ and VihasMakwana April 15, 2025 14:03
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Apr 15, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Apr 15, 2025

Cherry-pick of ae869d2 has failed:

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

You are currently cherry-picking commit ae869d241.
  (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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Apr 15, 2025
@github-actions github-actions bot added docs in progress Pull request is currently in progress. release automation Team:Automation Label for the Observability productivity team forwardport-main Automated forwardport with mergify labels Apr 15, 2025
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Apr 15, 2025
@pierrehilbert pierrehilbert added backport-9.0 Automated backport to the 9.0 branch backport-8.19 Automated backport to the 8.19 branch and removed forwardport-main Automated forwardport with mergify labels Apr 22, 2025
@pierrehilbert
Copy link
Contributor

pierrehilbert commented Apr 23, 2025

Unrelated failure, merging.

@pierrehilbert pierrehilbert merged commit 396898e into main Apr 23, 2025
183 of 190 checks passed
@pierrehilbert pierrehilbert deleted the mergify/bp/main/pr-43740 branch April 23, 2025 08:33
mergify bot added a commit that referenced this pull request Apr 23, 2025
@mergify
docs: Prepare Changelog for 8.18.0 (#43740) (#43928)
5712cf0 
* docs: Close changelog for 8.18.0

* Fix typos and formatting in CHANGELOG.

* Update CHANGELOG with Filebeat changes

---------

Co-authored-by: elasticmachine <elasticmachine@elastic.co>
Co-authored-by: Pierre HILBERT <pierre.hilbert@elastic.co>
Co-authored-by: Eric Beahan <eric.beahan@elastic.co>
(cherry picked from commit ae869d2)

# Conflicts:
#	CHANGELOG.asciidoc
#	libbeat/docs/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 <pierre.hilbert@elastic.co>
(cherry picked from commit 396898e)

# Conflicts:
#	CHANGELOG.asciidoc
#	libbeat/docs/release.asciidoc
mergify bot added a commit that referenced this pull request Apr 23, 2025
@mergify
docs: Prepare Changelog for 8.18.0 (#43740) (#43928)
8c75b00 
* docs: Close changelog for 8.18.0

* Fix typos and formatting in CHANGELOG.

* Update CHANGELOG with Filebeat changes

---------

Co-authored-by: elasticmachine <elasticmachine@elastic.co>
Co-authored-by: Pierre HILBERT <pierre.hilbert@elastic.co>
Co-authored-by: Eric Beahan <eric.beahan@elastic.co>
(cherry picked from commit ae869d2)

# Conflicts:
#	CHANGELOG.asciidoc
#	libbeat/docs/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 <pierre.hilbert@elastic.co>
(cherry picked from commit 396898e)

# Conflicts:
#	CHANGELOG.asciidoc
#	libbeat/docs/release.asciidoc
This was referenced Apr 23, 2025
Merged
Merged
pierrehilbert added a commit that referenced this pull request Apr 23, 2025
@mergify @pierrehilbert
[8.19](backport #43928) [main](backport #43740) docs: Prepare Changel…
c8401ec 
…og for 8.18.0 (#44028)

* docs: Prepare Changelog for 8.18.0 (#43740) (#43928)

* docs: Close changelog for 8.18.0

* Fix typos and formatting in CHANGELOG.

* Update CHANGELOG with Filebeat changes

---------

Co-authored-by: elasticmachine <elasticmachine@elastic.co>
Co-authored-by: Pierre HILBERT <pierre.hilbert@elastic.co>
Co-authored-by: Eric Beahan <eric.beahan@elastic.co>
(cherry picked from commit ae869d2)

# Conflicts:
#	CHANGELOG.asciidoc
#	libbeat/docs/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 <pierre.hilbert@elastic.co>
(cherry picked from commit 396898e)

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

* Update CHANGELOG.asciidoc

* Update release.asciidoc

* Update CHANGELOG.next.asciidoc

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Pierre HILBERT <pierre.hilbert@elastic.co>
pierrehilbert added a commit that referenced this pull request Apr 25, 2025
@mergify @pierrehilbert
[9.0](backport #43928) [main](backport #43740) docs: Prepare Changelo…
2be7095 
…g for 8.18.0 (#44029)

* docs: Prepare Changelog for 8.18.0 (#43740) (#43928)

* docs: Close changelog for 8.18.0

* Fix typos and formatting in CHANGELOG.

* Update CHANGELOG with Filebeat changes

---------

Co-authored-by: elasticmachine <elasticmachine@elastic.co>
Co-authored-by: Pierre HILBERT <pierre.hilbert@elastic.co>
Co-authored-by: Eric Beahan <eric.beahan@elastic.co>
(cherry picked from commit ae869d2)

# Conflicts:
#	CHANGELOG.asciidoc
#	libbeat/docs/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 <pierre.hilbert@elastic.co>
(cherry picked from commit 396898e)

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

* Update CHANGELOG.asciidoc

* Update CHANGELOG.asciidoc

* Update release.asciidoc

* Update CHANGELOG.next.asciidoc

* Update CHANGELOG.next.asciidoc

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Pierre HILBERT <pierre.hilbert@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pierrehilbert pierrehilbert pierrehilbert approved these changes

@AndersonQ AndersonQ Awaiting requested review from AndersonQ AndersonQ is a code owner automatically assigned from elastic/elastic-agent-data-plane

@VihasMakwana VihasMakwana Awaiting requested review from VihasMakwana VihasMakwana is a code owner automatically assigned from elastic/elastic-agent-data-plane

Assignees

No one assigned

Labels

automation backport backport-8.19 Automated backport to the 8.19 branch backport-9.0 Automated backport to the 9.0 branch conflicts There is a conflict in the backported pull request docs in progress Pull request is currently in progress. release Team:Automation Label for the Observability productivity team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@pierrehilbert