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 #40982) docs: Prepare Changelog for 8.15.2 #41008

Closed
wants to merge 4 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 26, 2024

Prepare Changelog for 8.15.2.

Merge after first BC.


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

* docs: Close changelog for 8.15.2

* 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 83effec)

# Conflicts:
#	CHANGELOG.asciidoc
@mergify mergify bot requested a review from a team as a code owner September 26, 2024 12:32
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 26, 2024
Copy link
Contributor Author

mergify bot commented Sep 26, 2024

Cherry-pick of 83effec has failed:

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

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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 26, 2024
Copy link

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

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

@botelastic
Copy link

botelastic bot commented Sep 26, 2024

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

Copy link
Contributor Author

mergify bot commented Sep 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 Sep 26, 2024
Copy link
Contributor Author

mergify bot commented Sep 30, 2024

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-40982 upstream/mergify/bp/main/pr-40982
git merge upstream/main
git push upstream mergify/bp/main/pr-40982

Copy link
Contributor Author

mergify bot commented Oct 7, 2024

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-40982 upstream/mergify/bp/main/pr-40982
git merge upstream/main
git push upstream mergify/bp/main/pr-40982

Copy link
Contributor Author

mergify bot commented Oct 21, 2024

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-40982 upstream/mergify/bp/main/pr-40982
git merge upstream/main
git push upstream mergify/bp/main/pr-40982

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 needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant