Skip to content

Backport #21818 to 21.1: Fix arena data race in two level merge#21880

Merged
CurtizJ merged 1 commit into21.1from
backport/21.1/21818
Mar 22, 2021
Merged

Backport #21818 to 21.1: Fix arena data race in two level merge#21880
CurtizJ merged 1 commit into21.1from
backport/21.1/21818

Conversation

@robot-clickhouse
Copy link
Copy Markdown
Member

Original pull-request #21818
Cherry-pick pull-request #21873

This pull-request is a last step of an automated backporting.
Treat it as a standard pull-request: look at the checks and resolve conflicts.
Merge it only if you intend to backport changes to the target branch, otherwise just close it.

@robot-clickhouse robot-clickhouse added the pr-backport Changes, backported to release branch. Do not use manually - automated use only! label Mar 18, 2021
@CurtizJ CurtizJ merged commit efbfbd2 into 21.1 Mar 22, 2021
@CurtizJ CurtizJ deleted the backport/21.1/21818 branch March 22, 2021 15:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr-backport Changes, backported to release branch. Do not use manually - automated use only!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants