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

[8.x](backport #41020) [main](backport #41011) Add missing changelog for ES fix. #41068

Open
wants to merge 1 commit into
base: 8.x
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 1, 2024

The changelog for the 8.15.1 bug that causes data ingestion to stop when connections have a transient error was omitted from the 8.15.2 changelog. Add it back.

It was added in a09bd51#diff-867eb8a32d99eda9bb244b7b86d7abd0031618bae71d0276fe139fe697c3063dR71 but we didn't merge 8.15 into #40982 before merging it to pick it up.


This is an automatic backport of pull request #41011 done by [Mergify](https://mergify.com).
This is an automatic backport of pull request #41020 done by [Mergify](https://mergify.com).

* Add missing changelog for ES fix. (#41011)

(cherry picked from commit f4fe6ae)

# Conflicts:
#	CHANGELOG.asciidoc

* Fix conflict in CHANGELOG.asciidoc

---------

Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>
(cherry picked from commit 4184106)

# Conflicts:
#	CHANGELOG.asciidoc
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 1, 2024
Copy link
Contributor Author

mergify bot commented Oct 1, 2024

Cherry-pick of 4184106 has failed:

On branch mergify/bp/8.x/pr-41020
Your branch is up to date with 'origin/8.x'.

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

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.asciidoc

no changes added to commit (use "git add" and/or "git commit -a")

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 Oct 1, 2024
@botelastic
Copy link

botelastic bot commented Oct 1, 2024

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

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/8.x/pr-41020 upstream/mergify/bp/8.x/pr-41020
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-41020

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.

0 participants