Skip to content

Cherry pick #22425 to 21.2: Add memory accounting in parallel formatting#22449

Merged
robot-clickhouse merged 4 commits intobackport/21.2/22425from
cherrypick/21.2/e3aa47c525e39c1861f3fa2f5f70ff97b620a0e6
Apr 1, 2021
Merged

Cherry pick #22425 to 21.2: Add memory accounting in parallel formatting#22449
robot-clickhouse merged 4 commits intobackport/21.2/22425from
cherrypick/21.2/e3aa47c525e39c1861f3fa2f5f70ff97b620a0e6

Conversation

@robot-clickhouse
Copy link
Copy Markdown
Member

Original pull-request #22425

This pull-request is a first step of an automated backporting.
It contains changes like after calling a local command git cherry-pick.
If you intend to continue backporting this changes, then resolve all conflicts if any.
Otherwise, if you do not want to backport them, then just close this pull-request.

The check results does not matter at this step - you can safely ignore them.
Also this pull-request will be merged automatically as it reaches the mergeable state, but you always can merge it manually.

@robot-clickhouse robot-clickhouse added do not test disable testing on pull request pr-cherrypick Cherry-pick of merge-commit before backporting. Do not use manually - automated use only! labels Apr 1, 2021
@robot-clickhouse robot-clickhouse merged this pull request into backport/21.2/22425 Apr 1, 2021
@robot-clickhouse robot-clickhouse deleted the cherrypick/21.2/e3aa47c525e39c1861f3fa2f5f70ff97b620a0e6 branch April 1, 2021 16:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do not test disable testing on pull request pr-cherrypick Cherry-pick of merge-commit before backporting. Do not use manually - automated use only!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants