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.14] 8.14.2: add missing changelog entry (backport #13555) #13578

Merged
merged 2 commits into from
Jul 4, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 4, 2024

Intially only merged on 8.14 branch, should have been merged on
main and backported.

Also add a missing changelog entry


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

Intially only merged on 8.14 branch, should have been merged on
main and backported.

Also add a missing changelog entry

(cherry picked from commit b99e36b)

# Conflicts:
#	changelogs/8.14.asciidoc
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jul 4, 2024
Copy link
Contributor Author

mergify bot commented Jul 4, 2024

Cherry-pick of b99e36b has failed:

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

You are currently cherry-picking commit b99e36bde.
  (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:   changelogs/8.14.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

@mergify mergify bot merged commit a606613 into 8.14 Jul 4, 2024
9 checks passed
@mergify mergify bot deleted the mergify/bp/8.14/pr-13555 branch July 4, 2024 08:49
marclop pushed a commit that referenced this pull request Jul 5, 2024
* 8.14.2: add missing changelog entry (#13555)

Intially only merged on 8.14 branch, should have been merged on
main and backported.

Also add a missing changelog entry

(cherry picked from commit b99e36b)

# Conflicts:
#	changelogs/8.14.asciidoc

* resolve conflicts

---------

Co-authored-by: Edoardo Tenani <526307+endorama@users.noreply.github.com>
Co-authored-by: Edoardo Tenani <edoardo.tenani@elastic.co>
Signed-off-by: Marc Lopez Rubio <marc5.12@outlook.com>
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants