Skip to content

Cherry pick #15982 to 20.8: Fix ambiguity in parsing of settings profiles.#16013

Merged
robot-clickhouse merged 2 commits intobackport/20.8/15982from
cherrypick/20.8/f7f59ca23f2dc3f0e431288c9c32a10048bfaa38
Oct 15, 2020
Merged

Cherry pick #15982 to 20.8: Fix ambiguity in parsing of settings profiles.#16013
robot-clickhouse merged 2 commits intobackport/20.8/15982from
cherrypick/20.8/f7f59ca23f2dc3f0e431288c9c32a10048bfaa38

Conversation

@robot-clickhouse
Copy link
Copy Markdown
Member

Original pull-request #15982

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.

Vitaly Baranov and others added 2 commits October 14, 2020 20:30
@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 Oct 15, 2020
@robot-clickhouse robot-clickhouse merged this pull request into backport/20.8/15982 Oct 15, 2020
@robot-clickhouse robot-clickhouse deleted the cherrypick/20.8/f7f59ca23f2dc3f0e431288c9c32a10048bfaa38 branch October 15, 2020 14:43
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.

3 participants