Skip to content

Backport #16011 to 20.10: Fix alter sorting key for ReplicatedVersionedCollapsingMergeTree#16142

Merged
alesapin merged 1 commit into20.10from
backport/20.10/16011
Oct 20, 2020
Merged

Backport #16011 to 20.10: Fix alter sorting key for ReplicatedVersionedCollapsingMergeTree#16142
alesapin merged 1 commit into20.10from
backport/20.10/16011

Conversation

@robot-clickhouse
Copy link
Copy Markdown
Member

Original pull-request #16011
Cherry-pick pull-request #16138

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 Oct 19, 2020
@alesapin
Copy link
Copy Markdown
Member

test_always_fetch_merged/test.py::test_replica_always_download seems like "merge deadlock", but not related to changes.

@alesapin alesapin merged commit 3a2ee88 into 20.10 Oct 20, 2020
@alesapin alesapin deleted the backport/20.10/16011 branch October 20, 2020 13:25
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.

2 participants