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 #36811) docs: Prepare Changelog for 7.17.14 #36819

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 10, 2023

This is an automatic backport of pull request #36811 done by Mergify.
Cherry-pick of 367c0d2 has failed:

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

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

* docs: Close changelog for 7.17.14

* Update CHANGELOG.asciidoc

* Apply suggestions from code review

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

* Update CHANGELOG.asciidoc

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

---------

Co-authored-by: Pierre HILBERT <[email protected]>
Co-authored-by: Brandon Morelli <[email protected]>
Co-authored-by: David Kilfoyle <[email protected]>
(cherry picked from commit 367c0d2)

# Conflicts:
#	CHANGELOG.asciidoc
#	libbeat/docs/release.asciidoc
@mergify mergify bot requested a review from a team as a code owner October 10, 2023 13:38
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 10, 2023
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 10, 2023
@botelastic
Copy link

botelastic bot commented Oct 10, 2023

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

@elasticmachine
Copy link
Collaborator

💚 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

  • Duration: 9 min 50 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 mergify bot deleted the mergify/bp/main/pr-36811 branch October 10, 2023 14:46
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 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