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 #36128) docs: Prepare Changelog for 8.9.0 #36154

Merged
merged 3 commits into from
Jul 27, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 25, 2023

This is an automatic backport of pull request #36128 done by Mergify.
Cherry-pick of b1b4d8b has failed:

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

You are currently cherry-picking commit b1b4d8b785.
  (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/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

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

# Conflicts:
#	CHANGELOG.asciidoc
#	libbeat/docs/release.asciidoc
@mergify mergify bot requested a review from a team as a code owner July 25, 2023 11:19
@mergify mergify bot requested review from ycombinator and leehinman July 25, 2023 11:19
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jul 25, 2023
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 25, 2023
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jul 25, 2023

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-07-27T16:11:50.932+0000

  • Duration: 10 min 31 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@mergify
Copy link
Contributor Author

mergify bot commented Jul 27, 2023

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

@pierrehilbert pierrehilbert added the Team:Elastic-Agent Label for the Agent team label Jul 27, 2023
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent (Team:Elastic-Agent)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jul 27, 2023
@pierrehilbert pierrehilbert merged commit b0124b4 into main Jul 27, 2023
@pierrehilbert pierrehilbert deleted the mergify/bp/main/pr-36128 branch July 27, 2023 16:29
Scholar-Li pushed a commit to Scholar-Li/beats that referenced this pull request Feb 5, 2024
…stic#36154)

* docs: Prepare Changelog for 8.9.0 (elastic#36128)

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

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

* Fixing conflicts

---------

Co-authored-by: Elastic Machine <[email protected]>
Co-authored-by: Pierre HILBERT <[email protected]>
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 Team:Elastic-Agent Label for the Agent team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants