diff --git a/cmake/version.cmake b/cmake/version.cmake index 15e08a799b7..3f51f59cf0f 100644 --- a/cmake/version.cmake +++ b/cmake/version.cmake @@ -1,11 +1,11 @@ # This strings autochanged from release_lib.sh: -set(VERSION_REVISION 54434) +set(VERSION_REVISION 54435) set(VERSION_MAJOR 20) -set(VERSION_MINOR 4) +set(VERSION_MINOR 5) set(VERSION_PATCH 1) set(VERSION_GITHASH 91df18a906dcffdbee6816e5389df6c65f86e35f) -set(VERSION_DESCRIBE v20.4.1.3177-prestable) -set(VERSION_STRING 20.4.1.3177) +set(VERSION_DESCRIBE v20.5.1.1-prestable) +set(VERSION_STRING 20.5.1.1) # end of autochange set(VERSION_EXTRA "" CACHE STRING "") diff --git a/debian/changelog b/debian/changelog index 870d5e4bac3..4ce601e18aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -clickhouse (20.4.1.1) unstable; urgency=low +clickhouse (20.5.1.1) unstable; urgency=low * Modified source code - -- clickhouse-release Thu, 12 Mar 2020 16:07:04 +0300 + -- clickhouse-release Tue, 28 Apr 2020 20:12:13 +0300 diff --git a/docker/client/Dockerfile b/docker/client/Dockerfile index b696e0688ae..978538e73cc 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.4.1.* +ARG version=20.5.1.* RUN apt-get update \ && apt-get install --yes --no-install-recommends \ diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile index 9c35a429419..faa5a593eb2 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.4.1.* +ARG version=20.5.1.* ARG gosu_ver=1.10 RUN apt-get update \ diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile index 412849049f1..1dd756ed7c2 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.4.1.* +ARG version=20.5.1.* 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 42c503b8efa..a4c4f698364 100644 --- a/src/Storages/System/StorageSystemContributors.generated.cpp +++ b/src/Storages/System/StorageSystemContributors.generated.cpp @@ -79,6 +79,8 @@ const char * auto_contributors[] { "Artemeey", "Artemkin Pavel", "Arthur Tokarchuk", + "Artur Beglaryan", + "AsiaKorushkina", "Atri Sharma", "Avogar", "Azat Khuzhin", @@ -92,6 +94,7 @@ const char * auto_contributors[] { "BlahGeek", "Bogdan", "Bogdan Voronin", + "BohuTANG", "Bolinov", "Boris Granveaud", "Bowen Masco", @@ -118,6 +121,8 @@ const char * auto_contributors[] { "Ding Xiang Fei", "Dmitrii Kovalkov", "Dmitrii Raev", + "Dmitry", + "Dmitry Belyavtsev", "Dmitry Bilunov", "Dmitry Galuza", "Dmitry Luhtionov", @@ -142,11 +147,13 @@ const char * auto_contributors[] { "Evgeny Konkov", "Fabian Stäber", "Fadi Hadzh", + "Fan()", "FawnD2", "FeehanG", "Flowyi", "Francisco Barón", "Fruit of Eden", + "Gagan Arneja", "Gary Dotzler", "George", "George G", @@ -155,6 +162,7 @@ const char * auto_contributors[] { "Gleb Novikov", "Gleb-Tretyakov", "Gregory", + "Grigory", "Grigory Pervakov", "Guillaume Tassery", "Hamoon", @@ -193,6 +201,7 @@ const char * auto_contributors[] { "Jason", "Javi santana bot", "Jean Baptiste Favre", + "Jochen Schalanda", "Jonatas Freitas", "Karl Pietrzak", "Keiji Yoshida", @@ -207,9 +216,11 @@ const char * auto_contributors[] { "Konstantin Malanchev", "Konstantin Podshumok", "Korviakov Andrey", + "Kruglov Pavel", "Leonardo Cecchi", "Leopold Schabel", "Lev Borodin", + "Lewinma", "Liu Cong", "LiuCong", "LiuYangkuan", @@ -225,6 +236,7 @@ const char * auto_contributors[] { "Marek Vavrusa", "Marek Vavruša", "Marek Vavruša", + "Maroun Maroun", "Marsel Arduanov", "Marti Raudsepp", "Martijn Bakker", @@ -240,11 +252,13 @@ const char * auto_contributors[] { "Maxim Kuznetsov", "Maxim Nikulin", "Maxim Sabyanin", + "Maxim Serebryakov", "Maxim Smirnov", "Maxim Ulanovskiy", "MaximAL", "MeiK", "Metehan Çetinkaya", + "Metikov Vadim", "Michael Furmur", "Michael Kolupaev", "Michael Monashev", @@ -316,8 +330,10 @@ const char * auto_contributors[] { "Roman Peshkurov", "Roman Tsisyk", "Ruslan", + "Ruzal Ibragimov", "Sabyanin Maxim", "SaltTan", + "Sami Kerola", "Samuel Chou", "Serge Rider", "Sergei Bocharov", @@ -347,6 +363,7 @@ const char * auto_contributors[] { "SuperBot", "Sébastien Launay", "TAC", + "TCeason", "Tangaev", "Tema Novikov", "The-Alchemist", @@ -373,11 +390,14 @@ const char * auto_contributors[] { "Vitaliy Kozlovskiy", "Vitaliy Lyudvichenko", "Vitaliy Zakaznikov", + "Vitaly", "Vitaly Baranov", "Vitaly Samigullin", "Vivien Maisonneuve", "Vlad Arkhipov", + "Vladimir", "Vladimir Chebotarev", + "Vladimir Goncharov", "Vladimir Kolobaev", "Vladimir Kopysov", "Vladimir Kozbin", @@ -463,17 +483,20 @@ const char * auto_contributors[] { "fredchenbj", "ggerogery", "glockbender", + "hao.he", "hcz", "hotid", "igor", "igor.lapko", "ikopylov", + "imgbot[bot]", "ivan-kush", "ivanzhukov", "javartisan", "javi", "javi santana", "kmeaw", + "koshachy", "kreuzerkrieg", "ks1322", "kshvakov", @@ -557,11 +580,14 @@ const char * auto_contributors[] { "vxider", "vzakaznikov", "wangchao", + "yonesko", "zamulla", "zhang2014", "zhangxiao018", "zhen ni", "zhukai", + "zvrr", + "zzsmdfj", "Šimon Podlipský", "Артем Стрельцов", "Георгий Кондратьев",