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 #42654) docs: Prepare Changelog for 8.17.2 #42668

Merged
merged 4 commits into from
Feb 12, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 11, 2025

Prepare Changelog for 8.17.2.

Merge once the BC that will be published is decided.


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

* docs: Close changelog for 8.17.2

* Update CHANGELOG.asciidoc

* Update CHANGELOG.asciidoc

* Apply suggestions from code review

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

---------

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

# Conflicts:
#	CHANGELOG.asciidoc
#	libbeat/docs/release.asciidoc
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 11, 2025
Copy link
Contributor Author

mergify bot commented Feb 11, 2025

Cherry-pick of e182712 has failed:

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

You are currently cherry-picking commit e18271240.
  (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 a review from a team as a code owner February 11, 2025 13:09
@mergify mergify bot requested review from rdner and mauri870 February 11, 2025 13:09
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Feb 11, 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 Feb 11, 2025
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Feb 11, 2025
Copy link
Contributor Author

mergify bot commented Feb 11, 2025

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/main/pr-42654 upstream/mergify/bp/main/pr-42654
git merge upstream/main
git push upstream mergify/bp/main/pr-42654

@pierrehilbert pierrehilbert added backport-8.x Automated backport to the 8.x branch with mergify backport-8.18 Automated backport to the 8.18 branch backport-9.0 Automated backport to the 9.0 branch labels Feb 11, 2025
@pierrehilbert pierrehilbert merged commit 70533da into main Feb 12, 2025
143 checks passed
@pierrehilbert pierrehilbert deleted the mergify/bp/main/pr-42654 branch February 12, 2025 06:59
mergify bot added a commit that referenced this pull request Feb 12, 2025
* docs: Prepare Changelog for 8.17.2 (#42654)

* docs: Close changelog for 8.17.2

* Update CHANGELOG.asciidoc

* Update CHANGELOG.asciidoc

* Apply suggestions from code review

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

---------

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

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

* Update release.asciidoc

* Update CHANGELOG.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 70533da)
mergify bot added a commit that referenced this pull request Feb 12, 2025
* docs: Prepare Changelog for 8.17.2 (#42654)

* docs: Close changelog for 8.17.2

* Update CHANGELOG.asciidoc

* Update CHANGELOG.asciidoc

* Apply suggestions from code review

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

---------

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

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

* Update release.asciidoc

* Update CHANGELOG.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 70533da)
mergify bot added a commit that referenced this pull request Feb 12, 2025
* docs: Prepare Changelog for 8.17.2 (#42654)

* docs: Close changelog for 8.17.2

* Update CHANGELOG.asciidoc

* Update CHANGELOG.asciidoc

* Apply suggestions from code review

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

---------

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

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

* Update release.asciidoc

* Update CHANGELOG.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 70533da)
pierrehilbert pushed a commit that referenced this pull request Feb 12, 2025
…42675)

* docs: Prepare Changelog for 8.17.2 (#42654)

* docs: Close changelog for 8.17.2

* Update CHANGELOG.asciidoc

* Update CHANGELOG.asciidoc

* Apply suggestions from code review

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

---------

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

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

* Update release.asciidoc

* Update CHANGELOG.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 70533da)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
pierrehilbert pushed a commit that referenced this pull request Feb 12, 2025
…42674)

* docs: Prepare Changelog for 8.17.2 (#42654)

* docs: Close changelog for 8.17.2

* Update CHANGELOG.asciidoc

* Update CHANGELOG.asciidoc

* Apply suggestions from code review

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

---------

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

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

* Update release.asciidoc

* Update CHANGELOG.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 70533da)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
pierrehilbert pushed a commit that referenced this pull request Feb 12, 2025
…42676)

* docs: Prepare Changelog for 8.17.2 (#42654)

* docs: Close changelog for 8.17.2

* Update CHANGELOG.asciidoc

* Update CHANGELOG.asciidoc

* Apply suggestions from code review

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

---------

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

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

* Update release.asciidoc

* Update CHANGELOG.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 70533da)

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
automation backport backport-8.x Automated backport to the 8.x branch with mergify backport-8.18 Automated backport to the 8.18 branch backport-9.0 Automated backport to the 9.0 branch conflicts There is a conflict in the backported pull request docs forwardport-main Automated forwardport with mergify in progress Pull request is currently in progress. release Team:Automation Label for the Observability productivity team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant