Skip to content

Don't backport base commit of branch in the same branch#20628

Merged
abyss7 merged 1 commit intoClickHouse:masterfrom
abyss7:fix-backport
Feb 17, 2021
Merged

Don't backport base commit of branch in the same branch#20628
abyss7 merged 1 commit intoClickHouse:masterfrom
abyss7:fix-backport

Conversation

@abyss7
Copy link
Copy Markdown
Contributor

@abyss7 abyss7 commented Feb 17, 2021

I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=en

Changelog category (leave one):

  • Not for changelog (changelog entry is not required)

@robot-clickhouse robot-clickhouse added the pr-not-for-changelog This PR should not be mentioned in the changelog label Feb 17, 2021
@abyss7
Copy link
Copy Markdown
Contributor Author

abyss7 commented Feb 17, 2021

No need for review - it's python utils

@abyss7 abyss7 merged commit 42c2247 into ClickHouse:master Feb 17, 2021
@abyss7 abyss7 deleted the fix-backport branch February 17, 2021 15:55
traceon added a commit to traceon/ClickHouse that referenced this pull request Feb 19, 2021
* master: (160 commits)
  Make Poco HTTP Server zero-copy again (ClickHouse#19516)
  Fixed documentation
  ccache 4.2+ does not requires any quirks for SOURCE_DATE_EPOCH
  Add a function `htmlOrXmlCoarseParse` to extract content from html or xml format string. (ClickHouse#19600)
  Reinterpret function added Decimal, DateTim64 support
  Add test
  Update InterpreterSelectQuery.cpp
  Improved serialization for data types combined of Arrays and Tuples. Improved matching enum data types to protobuf enum type. Fixed serialization of the Map data type. Omitted values are now set by default.
  Log stdout and stderr when failed to start docker in integration tests.
  Added comment
  Don't backport base commit of branch in the same branch (ClickHouse#20628)
  Fix fasttest retry for failed tests
  Dictionary create source with functions crash fix
  Added error reinterpretation tests
  Update run.sh
  Updated documentation
  fix subquery with limit
  Rename untyped function reinterpretAs into reinterpret
  ignore data store files
  Support vhost
  ...
traceon added a commit to traceon/ClickHouse that referenced this pull request Feb 19, 2021
* master: (153 commits)
  Add gdb to fasttest image
  Make Poco HTTP Server zero-copy again (ClickHouse#19516)
  Use fixed version for aerospike
  Fixed documentation
  ccache 4.2+ does not requires any quirks for SOURCE_DATE_EPOCH
  Add a function `htmlOrXmlCoarseParse` to extract content from html or xml format string. (ClickHouse#19600)
  Reinterpret function added Decimal, DateTim64 support
  test/stress: fix permissions for clickhouse directories
  test/stress: improve backtrace catching on server failures
  test/stress: use clickhouse builtin start/stop to run server from the same user
  Add test
  Update InterpreterSelectQuery.cpp
  Improved serialization for data types combined of Arrays and Tuples. Improved matching enum data types to protobuf enum type. Fixed serialization of the Map data type. Omitted values are now set by default.
  Log stdout and stderr when failed to start docker in integration tests.
  Added comment
  Don't backport base commit of branch in the same branch (ClickHouse#20628)
  Fix fasttest retry for failed tests
  Dictionary create source with functions crash fix
  Added error reinterpretation tests
  Update run.sh
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr-not-for-changelog This PR should not be mentioned in the changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants