From 4bd47b8adc36bce4d7735b90a1e671888b205679 Mon Sep 17 00:00:00 2001 From: robot-clickhouse Date: Mon, 22 Jun 2020 20:40:26 +0300 Subject: [PATCH] Auto version update to [20.6.1.1] [54436] --- cmake/autogenerated_versions.txt | 8 +-- debian/changelog | 4 +- docker/client/Dockerfile | 2 +- docker/server/Dockerfile | 2 +- docker/test/Dockerfile | 2 +- .../StorageSystemContributors.generated.cpp | 64 +++++++++++++++++++ 6 files changed, 73 insertions(+), 9 deletions(-) diff --git a/cmake/autogenerated_versions.txt b/cmake/autogenerated_versions.txt index dae535584ef..27dd8cc8f15 100644 --- a/cmake/autogenerated_versions.txt +++ b/cmake/autogenerated_versions.txt @@ -1,9 +1,9 @@ # This strings autochanged from release_lib.sh: -SET(VERSION_REVISION 54435) +SET(VERSION_REVISION 54436) SET(VERSION_MAJOR 20) -SET(VERSION_MINOR 5) +SET(VERSION_MINOR 6) SET(VERSION_PATCH 1) SET(VERSION_GITHASH efc57fb063b3fb4df968d916720ec4d4ced4642e) -SET(VERSION_DESCRIBE v20.5.1.3833-prestable) -SET(VERSION_STRING 20.5.1.3833) +SET(VERSION_DESCRIBE v20.6.1.1-prestable) +SET(VERSION_STRING 20.6.1.1) # end of autochange diff --git a/debian/changelog b/debian/changelog index 4ce601e18aa..0c0a59005f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -clickhouse (20.5.1.1) unstable; urgency=low +clickhouse (20.6.1.1) unstable; urgency=low * Modified source code - -- clickhouse-release Tue, 28 Apr 2020 20:12:13 +0300 + -- clickhouse-release Mon, 22 Jun 2020 20:40:23 +0300 diff --git a/docker/client/Dockerfile b/docker/client/Dockerfile index 66e0831163e..c4683d35e99 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.5.1.* +ARG version=20.6.1.* RUN apt-get update \ && apt-get install --yes --no-install-recommends \ diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile index 4a09721ea53..132a5d89959 100644 --- a/docker/server/Dockerfile +++ b/docker/server/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:18.04 ARG repository="deb https://repo.clickhouse.tech/deb/stable/ main/" -ARG version=20.5.1.* +ARG version=20.6.1.* ARG gosu_ver=1.10 RUN apt-get update \ diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile index 6673d32c2e2..be6d6d73793 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.5.1.* +ARG version=20.6.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 a4c4f698364..047221420a1 100644 --- a/src/Storages/System/StorageSystemContributors.generated.cpp +++ b/src/Storages/System/StorageSystemContributors.generated.cpp @@ -4,9 +4,11 @@ const char * auto_contributors[] { "243f6a8885a308d313198a2e037", "821008736@qq.com", "Akazz", + "Albert Kidrachev", "Alberto", "Aleksandra (Ася)", "Aleksei Levushkin", + "Aleksey", "Aleksey Akulovich", "Alex Bocharov", "Alex Krash", @@ -32,12 +34,15 @@ const char * auto_contributors[] { "Alexander Sapin", "Alexander Tokmakov", "Alexander Tretiakov", + "Alexandr Kondratev", "Alexandr Krasheninnikov", "Alexandr Orlov", "Alexei Averchenko", "Alexey", "Alexey Arno", + "Alexey Dushechkin", "Alexey Elymanov", + "Alexey Ilyukhov", "Alexey Milovidov", "Alexey Tronov", "Alexey Vasiliev", @@ -53,18 +58,22 @@ const char * auto_contributors[] { "AndreevDm", "Andrei Bodrov", "Andrei Chulkov", + "Andrei Nekrashevich", "Andrew Grigorev", "Andrew Onyshchuk", "Andrey", "Andrey Chulkov", "Andrey Dudin", + "Andrey Kadochnikov", "Andrey Konchagin", "Andrey Konyaev", "Andrey M", "Andrey Mironov", + "Andrey Skobtsov", "Andrey Urusov", "Andy Yang", "Anton Kobzev", + "Anton Okhitin", "Anton Okulov", "Anton Patsev", "Anton Popov", @@ -74,7 +83,9 @@ const char * auto_contributors[] { "Anton Zhabolenko", "Arsen Hakobyan", "Artem Andreenko", + "Artem Gavrilov", "Artem Konovalov", + "Artem Streltsov", "Artem Zuikov", "Artemeey", "Artemkin Pavel", @@ -90,6 +101,7 @@ const char * auto_contributors[] { "BanyRule", "Baudouin Giard", "BayoNet", + "Bharat Nallan", "Big Elephant", "BlahGeek", "Bogdan", @@ -101,6 +113,7 @@ const char * auto_contributors[] { "Brett Hoerner", "Bulat Gaifullin", "Carbyn", + "Chao Wang", "Chen Yufei", "Ciprian Hacman", "Clement Rodriguez", @@ -119,6 +132,7 @@ const char * auto_contributors[] { "Denis Zhuravlev", "Derek Perkins", "Ding Xiang Fei", + "Dmitriev Mikhail", "Dmitrii Kovalkov", "Dmitrii Raev", "Dmitry", @@ -132,6 +146,7 @@ const char * auto_contributors[] { "Dmitry Rubashkin", "Dmitry S..ky / skype: dvska-at-skype", "Doge", + "DoomzD", "Dr. Strange Looker", "Eldar Zaitov", "Elena Baskakova", @@ -141,17 +156,21 @@ const char * auto_contributors[] { "Ernest Poletaev", "Eugene Klimov", "Eugene Konkov", + "Evgenia Sudarikova", "Evgenii Pravda", "Evgeniy Gatov", "Evgeniy Udodov", "Evgeny Konkov", + "Ewout", "Fabian Stäber", "Fadi Hadzh", "Fan()", "FawnD2", "FeehanG", + "Filipe Caixeta", "Flowyi", "Francisco Barón", + "Frank Zhao", "Fruit of Eden", "Gagan Arneja", "Gary Dotzler", @@ -196,6 +215,7 @@ const char * auto_contributors[] { "Ivan Kushnarenko", "Ivan Lezhankin", "Ivan Remen", + "Ivan Starkov", "Ivan Zhukov", "JaosnHsieh", "Jason", @@ -216,6 +236,7 @@ const char * auto_contributors[] { "Konstantin Malanchev", "Konstantin Podshumok", "Korviakov Andrey", + "Kozlov Ivan", "Kruglov Pavel", "Leonardo Cecchi", "Leopold Schabel", @@ -246,6 +267,7 @@ const char * auto_contributors[] { "Max Akhmedov", "Max Vetrov", "Maxim Akhmedov", + "Maxim Babenko", "Maxim Fedotov", "Maxim Fridental", "Maxim Khrisanfov", @@ -263,6 +285,7 @@ const char * auto_contributors[] { "Michael Kolupaev", "Michael Monashev", "Michael Razuvaev", + "Michael Smitasin", "Michal Lisowski", "Mihail Fandyushin", "Mikahil Nacharov", @@ -271,12 +294,14 @@ const char * auto_contributors[] { "Mikhail Fandyushin", "Mikhail Filimonov", "Mikhail Korotov", + "Mikhail Malafeev", "Mikhail Nacharov", "Mikhail Salosin", "Mikhail Surin", "Mikhail f. Shiryaev", "Milad Arabi", "Mohammad Hossein Sekhavat", + "MovElb", "Murat Kabilov", "NIKITA MIKHAILOV", "Narek Galstyan", @@ -289,8 +314,10 @@ const char * auto_contributors[] { "Nikita Lapkov", "Nikita Mikhailov", "Nikita Mikhaylov", + "Nikita Orlov", "Nikita Vasilev", "Nikolai Kochetov", + "Nikolai Sorokin", "Nikolay Degterinsky", "Nikolay Kirsh", "Nikolay Semyachkin", @@ -305,6 +332,7 @@ const char * auto_contributors[] { "Olga Khvostikova", "Orivej Desh", "Oskar Wojciski", + "Paramtamtam", "Pavel", "Pavel Kartaviy", "Pavel Kartavyy", @@ -315,8 +343,10 @@ const char * auto_contributors[] { "Pavlo Bashynskiy", "Pawel Rog", "Persiyanov Dmitriy Andreevich", + "Pervakov Grigorii", "Pervakov Grigory", "Philippe Ombredanne", + "Potya", "Pradeep Chhetri", "Quid37", "Rafael David Tinoco", @@ -324,6 +354,7 @@ const char * auto_contributors[] { "Ravengg", "Reilee", "Reto Kromer", + "Ri", "Roman Lipovsky", "Roman Nikolaev", "Roman Nozdrin", @@ -331,10 +362,12 @@ const char * auto_contributors[] { "Roman Tsisyk", "Ruslan", "Ruzal Ibragimov", + "S.M.A. Djawadi", "Sabyanin Maxim", "SaltTan", "Sami Kerola", "Samuel Chou", + "Saulius Valatka", "Serge Rider", "Sergei Bocharov", "Sergei Semin", @@ -364,10 +397,12 @@ const char * auto_contributors[] { "Sébastien Launay", "TAC", "TCeason", + "Tagir Kuskarov", "Tangaev", "Tema Novikov", "The-Alchemist", "Tobias Adamson", + "Tom Bombadil", "Tsarkova Anastasia", "Ubuntu", "Ubus", @@ -377,6 +412,7 @@ const char * auto_contributors[] { "Vadim Skipin", "VadimPE", "Valera Ryaboshapko", + "Vasily Morozov", "Vasily Nemkov", "Vasily Okunev", "Vasily Vasilkov", @@ -396,7 +432,9 @@ const char * auto_contributors[] { "Vivien Maisonneuve", "Vlad Arkhipov", "Vladimir", + "Vladimir Bunchuk", "Vladimir Chebotarev", + "Vladimir Golovchenko", "Vladimir Goncharov", "Vladimir Kolobaev", "Vladimir Kopysov", @@ -405,6 +443,7 @@ const char * auto_contributors[] { "Vladislav Rassokhin", "Vladislav Smirnov", "Vojtech Splichal", + "Volodymyr Kuznetsov", "Vsevolod Orlov", "Vxider", "Vyacheslav Alipov", @@ -416,6 +455,7 @@ const char * auto_contributors[] { "Yegor Andreenko", "Yiğit Konur", "Yohann Jardin", + "Yuntao Wu", "Yuri Dyachenko", "Yurii Vlasenko", "Yuriy", @@ -423,6 +463,7 @@ const char * auto_contributors[] { "Yury Karpovich", "Yury Stankevich", "Zhichang Yu", + "Zhipeng", "abdrakhmanov", "abyss7", "achimbab", @@ -448,6 +489,8 @@ const char * auto_contributors[] { "benamazing", "bgranvea", "blazerer", + "bluebirddm", + "bobrovskij artemij", "bseng", "cekc", "champtar", @@ -462,6 +505,7 @@ const char * auto_contributors[] { "decaseal", "dependabot-preview[bot]", "dependabot[bot]", + "dgrr", "dimarub2000", "dinosaur", "dmitrii", @@ -471,20 +515,28 @@ const char * auto_contributors[] { "egatov", "elBroom", "elenaspb2019", + "emironyuk", "evtan", + "exprmntr", "ezhaka", "f1yegor", + "favstovol", "felixoid", "fenglv", "fessmage", "filimonov", "flow", "foxxmary", + "frank", + "franklee", "fredchenbj", + "g-arslan", "ggerogery", + "giordyb", "glockbender", "hao.he", "hcz", + "hexiaoting", "hotid", "igor", "igor.lapko", @@ -500,6 +552,7 @@ const char * auto_contributors[] { "kreuzerkrieg", "ks1322", "kshvakov", + "kssenii", "l", "lalex", "leozhang", @@ -513,11 +566,14 @@ const char * auto_contributors[] { "liuyimin", "liyang", "lomberts", + "long2ice", "luc1ph3r", + "madianjun", "maiha", "malkfilipp", "maqroll", "maxim", + "maxim-babenko", "maxkuzn", "maxulan", "memo", @@ -527,8 +583,10 @@ const char * auto_contributors[] { "mfridental", "miha-g", "millb", + "mnkonkova", "morty", "moscas", + "myrrc", "nagorny", "never lee", "nicelulu", @@ -543,6 +601,7 @@ const char * auto_contributors[] { "palasonicq", "peshkurov", "philip.han", + "potya", "proller", "pufit", "pyos", @@ -562,6 +621,7 @@ const char * auto_contributors[] { "simon-says", "spyros87", "stavrolia", + "stepenhu", "sundy", "sundy-li", "sundyli", @@ -577,9 +637,11 @@ const char * auto_contributors[] { "velom", "vicdashkov", "vinity", + "vitstn", "vxider", "vzakaznikov", "wangchao", + "xPoSx", "yonesko", "zamulla", "zhang2014", @@ -600,7 +662,9 @@ const char * auto_contributors[] { "小路", "张健", "张风啸", + "极客青年", "谢磊", "黄朝晖", + "黄璞", "박현우", nullptr};