diff --git a/dbms/cmake/version.cmake b/dbms/cmake/version.cmake index 461e7519dda..16e3829c83b 100644 --- a/dbms/cmake/version.cmake +++ b/dbms/cmake/version.cmake @@ -1,11 +1,11 @@ # This strings autochanged from release_lib.sh: -set(VERSION_REVISION 54432) +set(VERSION_REVISION 54433) set(VERSION_MAJOR 20) -set(VERSION_MINOR 2) +set(VERSION_MINOR 3) set(VERSION_PATCH 1) set(VERSION_GITHASH d93e7e5ccf8fcca724e917581b00bf569947fff9) -set(VERSION_DESCRIBE v20.2.1.2443-prestable) -set(VERSION_STRING 20.2.1.2443) +set(VERSION_DESCRIBE v20.3.1.1-prestable) +set(VERSION_STRING 20.3.1.1) # end of autochange set(VERSION_EXTRA "" CACHE STRING "") diff --git a/dbms/src/Storages/System/StorageSystemContributors.generated.cpp b/dbms/src/Storages/System/StorageSystemContributors.generated.cpp index 9f871507c3e..bf6eca762d9 100644 --- a/dbms/src/Storages/System/StorageSystemContributors.generated.cpp +++ b/dbms/src/Storages/System/StorageSystemContributors.generated.cpp @@ -6,6 +6,7 @@ const char * auto_contributors[] { "Akazz", "Alberto", "Aleksandra (Ася)", + "Aleksei Levushkin", "Aleksey Akulovich", "Alex Bocharov", "Alex Krash", @@ -48,10 +49,14 @@ const char * auto_contributors[] { "Amy Krishnevsky", "Anastasiya Rodigina", "Anastasiya Tsarkova", + "Anatoly Pugachev", "AndreevDm", "Andrei Bodrov", + "Andrei Chulkov", "Andrew Grigorev", + "Andrew Onyshchuk", "Andrey", + "Andrey Chulkov", "Andrey Dudin", "Andrey Konchagin", "Andrey Konyaev", @@ -75,11 +80,13 @@ const char * auto_contributors[] { "Artemkin Pavel", "Arthur Tokarchuk", "Atri Sharma", + "Avogar", "Azat Khuzhin", "BSD_Conqueror", "Babacar Diassé", "Bakhtiyor Ruziev", "BanyRule", + "Baudouin Giard", "BayoNet", "Big Elephant", "BlahGeek", @@ -146,6 +153,7 @@ const char * auto_contributors[] { "Gleb Kanterov", "Gleb Novikov", "Gleb-Tretyakov", + "Gregory", "Grigory Pervakov", "Guillaume Tassery", "Hamoon", @@ -165,8 +173,11 @@ const char * auto_contributors[] { "Ilya Korol", "Ilya Korolev", "Ilya Kovalenko", + "Ilya Mazaev", "Ilya Shipitsin", "Ilya Skrypitsa", + "Ilya Yatsishin", + "ImgBotApp", "Ivan", "Ivan Babrou", "Ivan Blinkov", @@ -208,6 +219,7 @@ const char * auto_contributors[] { "Maks Skorokhod", "Maksim", "Maksim Fedotov", + "Marat IDRISOV", "Marek Vavrusa", "Marek Vavruša", "Marek Vavruša", @@ -226,6 +238,7 @@ const char * auto_contributors[] { "Maxim Kuznetsov", "Maxim Nikulin", "Maxim Sabyanin", + "Maxim Smirnov", "Maxim Ulanovskiy", "MaximAL", "MeiK", @@ -236,6 +249,7 @@ const char * auto_contributors[] { "Michael Razuvaev", "Michal Lisowski", "Mihail Fandyushin", + "Mikahil Nacharov", "Mike F", "Mikhail", "Mikhail Fandyushin", @@ -252,6 +266,7 @@ const char * auto_contributors[] { "Narek Galstyan", "NeZeD [Mac Pro]", "Neeke Gao", + "Nico Mandery", "Nicolae Vartolomei", "Nik", "Nikhil Raman", @@ -273,6 +288,7 @@ const char * auto_contributors[] { "Oleg Obleukhov", "Olga Khvostikova", "Orivej Desh", + "Oskar Wojciski", "Pavel", "Pavel Kartaviy", "Pavel Kartavyy", @@ -319,6 +335,7 @@ const char * auto_contributors[] { "Silviu Caragea", "Simon Podlipsky", "Sjoerd Mulder", + "Slach", "Snow", "Stanislav Pavlovichev", "Stas Pavlovichev", @@ -327,11 +344,13 @@ const char * auto_contributors[] { "Stupnikov Andrey", "SuperBot", "Sébastien Launay", + "TAC", "Tangaev", "Tema Novikov", "The-Alchemist", "Tobias Adamson", "Tsarkova Anastasia", + "Ubuntu", "Ubus", "VDimir", "Vadim", @@ -345,6 +364,7 @@ const char * auto_contributors[] { "Vasilyev Nikita", "Veloman Yunkan", "Veniamin Gvozdikov", + "Veselkov Konstantin", "Victor Tarnavsky", "Viktor Taranenko", "Vitaliy Karnienko", @@ -373,6 +393,7 @@ const char * auto_contributors[] { "Yatsishin Ilya", "Yegor Andreenko", "Yiğit Konur", + "Yohann Jardin", "Yuri Dyachenko", "Yurii Vlasenko", "Yuriy", @@ -417,6 +438,7 @@ const char * auto_contributors[] { "dasmfm", "davydovska", "decaseal", + "dependabot-preview[bot]", "dependabot[bot]", "dimarub2000", "dinosaur", @@ -443,6 +465,7 @@ const char * auto_contributors[] { "hotid", "igor", "igor.lapko", + "ikopylov", "ivan-kush", "ivanzhukov", "javartisan", @@ -453,6 +476,7 @@ const char * auto_contributors[] { "ks1322", "kshvakov", "l", + "lalex", "leozhang", "levushkin aleksej", "levysh", @@ -482,8 +506,10 @@ const char * auto_contributors[] { "nagorny", "never lee", "nicelulu", + "nikitamikhaylov", "nonexistence", "ns-vasilev", + "oandrew", "objatie_groba", "ogorbacheva", "olegkv", @@ -510,6 +536,7 @@ const char * auto_contributors[] { "simon-says", "spyros87", "stavrolia", + "sundy", "sundy-li", "sundyli", "svladykin", diff --git a/debian/changelog b/debian/changelog index 0a9449448a8..e44f26e5d48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -clickhouse (20.2.1.1) unstable; urgency=low +clickhouse (20.3.1.1) unstable; urgency=low * Modified source code - -- clickhouse-release Mon, 13 Jan 2020 22:21:05 +0300 + -- clickhouse-release Sat, 22 Feb 2020 00:35:30 +0300 diff --git a/docker/client/Dockerfile b/docker/client/Dockerfile index be0e034ce40..0c7f0d4d709 100644 --- a/docker/client/Dockerfile +++ b/docker/client/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:18.04 ARG repository="deb http://repo.yandex.ru/clickhouse/deb/stable/ main/" -ARG version=20.2.1.* +ARG version=20.3.1.* RUN apt-get update \ && apt-get install --yes --no-install-recommends \ diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile index fb41984f224..13fd4b09857 100644 --- a/docker/server/Dockerfile +++ b/docker/server/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:18.04 ARG repository="deb http://repo.yandex.ru/clickhouse/deb/stable/ main/" -ARG version=20.2.1.* +ARG version=20.3.1.* ARG gosu_ver=1.10 RUN apt-get update \ diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile index 3b6f1515c79..c7011024f58 100644 --- a/docker/test/Dockerfile +++ b/docker/test/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:18.04 ARG repository="deb http://repo.yandex.ru/clickhouse/deb/stable/ main/" -ARG version=20.2.1.* +ARG version=20.3.1.* RUN apt-get update && \ apt-get install -y apt-transport-https dirmngr && \