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 #41380) [main](backport #41379) Document 8.15 memory usage regression as a known issue. #41392

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 23, 2024

See #41355 for the complete description and mitigation.


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

…own issue. (#41380)

* Document memory usage regression as a known issue. (#41379)

(cherry picked from commit f8bd07d)

# Conflicts:
#	CHANGELOG.asciidoc

* Fix conflicts

---------

Co-authored-by: Craig MacKenzie <[email protected]>
(cherry picked from commit 1aa9ef6)

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

mergify bot commented Oct 23, 2024

Cherry-pick of 1aa9ef6 has failed:

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

You are currently cherry-picking commit 1aa9ef69d3.
  (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 23, 2024
@botelastic
Copy link

botelastic bot commented Oct 23, 2024

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

Copy link
Contributor Author

mergify bot commented Nov 25, 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-41380 upstream/mergify/bp/8.x/pr-41380
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-41380

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