diff --git a/cmake/autogenerated_versions.txt b/cmake/autogenerated_versions.txt index 0e65568f185ff73fc0f30609e616a600ab2b410f..967da33b0b20a1d7284ee3b6d691ce92a819963a 100644 --- a/cmake/autogenerated_versions.txt +++ b/cmake/autogenerated_versions.txt @@ -2,8 +2,8 @@ SET(VERSION_REVISION 54443) SET(VERSION_MAJOR 20) SET(VERSION_MINOR 12) -SET(VERSION_PATCH 1) -SET(VERSION_GITHASH c53725fb1f846fda074347607ab582fbb9c6f7a1) -SET(VERSION_DESCRIBE v20.12.1.1-prestable) -SET(VERSION_STRING 20.12.1.1) +SET(VERSION_PATCH 2) +SET(VERSION_GITHASH e581f9ccfc5c64867b0f488cce72412fd2966471) +SET(VERSION_DESCRIBE v20.12.2.1-prestable) +SET(VERSION_STRING 20.12.2.1) # end of autochange diff --git a/debian/changelog b/debian/changelog index 3da82efd47ecc2972e970d096204eb90183010a7..0c2e1484b3c9e4f5fe4e929a1b5b695781a7633a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -clickhouse (20.12.1.1) unstable; urgency=low +clickhouse (20.12.2.1) unstable; urgency=low * Modified source code - -- clickhouse-release Thu, 05 Nov 2020 21:52:47 +0300 + -- clickhouse-release Mon, 23 Nov 2020 10:29:12 +0300 diff --git a/docker/client/Dockerfile b/docker/client/Dockerfile index 2223b942429dcb045e320391d1c7d5acfdeea097..bc6dba15aa6edfdc5a66867f0f5e364cd4c724c5 100644 --- a/docker/client/Dockerfile +++ b/docker/client/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:18.04 ARG repository="deb https://repo.clickhouse.tech/deb/stable/ main/" -ARG version=20.12.1.* +ARG version=20.12.2.* RUN apt-get update \ && apt-get install --yes --no-install-recommends \ diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile index 1ce6e427409915a25039d5df23690e29245c33f5..cd73086e317a52f83e3b476c2f57b93b57ab5bae 100644 --- a/docker/server/Dockerfile +++ b/docker/server/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:20.04 ARG repository="deb https://repo.clickhouse.tech/deb/stable/ main/" -ARG version=20.12.1.* +ARG version=20.12.2.* ARG gosu_ver=1.10 RUN apt-get update \ diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile index cd2bead5616384d2c584b91dcefb10cc18c7d55f..3f8a0f5abdd4c675cafcddebc6126f77b552a025 100644 --- a/docker/test/Dockerfile +++ b/docker/test/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:18.04 ARG repository="deb https://repo.clickhouse.tech/deb/stable/ main/" -ARG version=20.12.1.* +ARG version=20.12.2.* RUN apt-get update && \ apt-get install -y apt-transport-https dirmngr && \ diff --git a/src/Storages/System/StorageSystemContributors.generated.cpp b/src/Storages/System/StorageSystemContributors.generated.cpp index 1540a43716f59ed65f9cfb3c949025011d21829e..39dc74822e00200c6cfd762caac40e9a24989f4c 100644 --- a/src/Storages/System/StorageSystemContributors.generated.cpp +++ b/src/Storages/System/StorageSystemContributors.generated.cpp @@ -93,6 +93,7 @@ const char * auto_contributors[] { "Anton Zhabolenko", "Ariel Robaldo", "Arsen Hakobyan", + "ArtCorp", "Artem Andreenko", "Artem Gavrilov", "Artem Hnilov", @@ -104,6 +105,7 @@ const char * auto_contributors[] { "Arthur Petukhovsky", "Arthur Tokarchuk", "Arthur Wong", + "Artur", "Artur Beglaryan", "AsiaKorushkina", "Atri Sharma", @@ -259,6 +261,7 @@ const char * auto_contributors[] { "Jochen Schalanda", "John", "Jonatas Freitas", + "Kang Liu", "Karl Pietrzak", "Keiji Yoshida", "Kiran", @@ -353,6 +356,7 @@ const char * auto_contributors[] { "NeZeD [Mac Pro]", "Neeke Gao", "Nico Mandery", + "Nico Piderman", "Nicolae Vartolomei", "Nik", "Nikhil Raman", @@ -379,7 +383,9 @@ const char * auto_contributors[] { "Olga Revyakina", "Orivej Desh", "Oskar Wojciski", + "OuO", "Paramtamtam", + "Patrick Zippenfenig", "Pavel", "Pavel Kartaviy", "Pavel Kartavyy", @@ -461,6 +467,7 @@ const char * auto_contributors[] { "Tsarkova Anastasia", "Ubuntu", "Ubus", + "V", "VDimir", "Vadim", "Vadim Plakhtinskiy", @@ -527,6 +534,7 @@ const char * auto_contributors[] { "Yury Stankevich", "Zhichang Yu", "Zhipeng", + "a.palagashvili", "abdrakhmanov", "abyss7", "achimbab", @@ -546,6 +554,7 @@ const char * auto_contributors[] { "ana-uvarova", "andrei-karpliuk", "andrewsg", + "annvsh", "anrodigina", "antikvist", "anton", @@ -613,8 +622,10 @@ const char * auto_contributors[] { "ggerogery", "giordyb", "glockbender", + "gyuton", "hao.he", "hcz", + "heng zhao", "hexiaoting", "hotid", "hustnn", @@ -694,6 +705,7 @@ const char * auto_contributors[] { "pufit", "pyos", "qianlixiang", + "qianmoQ", "quid", "r1j1k", "rainbowsysu", @@ -716,6 +728,7 @@ const char * auto_contributors[] { "spyros87", "stavrolia", "stepenhu", + "su-houzhen", "sundy", "sundy-li", "sundyli", @@ -727,6 +740,7 @@ const char * auto_contributors[] { "tavplubix", "topvisor", "tyrionhuang", + "ubuntu", "unegare", "unknown", "urgordeadbeef",