diff --git a/cmake/autogenerated_versions.txt b/cmake/autogenerated_versions.txt index cf0869c224d..6473e98f296 100644 --- a/cmake/autogenerated_versions.txt +++ b/cmake/autogenerated_versions.txt @@ -2,11 +2,11 @@ # NOTE: has nothing common with DBMS_TCP_PROTOCOL_VERSION, # only DBMS_TCP_PROTOCOL_VERSION should be incremented on protocol changes. -SET(VERSION_REVISION 54455) +SET(VERSION_REVISION 54454) SET(VERSION_MAJOR 21) -SET(VERSION_MINOR 10) +SET(VERSION_MINOR 9) SET(VERSION_PATCH 1) SET(VERSION_GITHASH a091f2e36054061ceebb6826a590f8fb86f01196) -SET(VERSION_DESCRIBE v21.10.1.1-prestable) -SET(VERSION_STRING 21.10.1.1) +SET(VERSION_DESCRIBE v21.9.1.7485-prestable) +SET(VERSION_STRING 21.9.1.7485) # end of autochange diff --git a/debian/changelog b/debian/changelog index f3e740d20cf..38f740ae062 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -clickhouse (21.10.1.1) unstable; urgency=low +clickhouse (21.9.1.1) unstable; urgency=low * Modified source code - -- clickhouse-release Sat, 17 Jul 2021 08:45:03 +0300 + -- clickhouse-release Sat, 10 Jul 2021 08:22:49 +0300 diff --git a/docker/client/Dockerfile b/docker/client/Dockerfile index 052e008fd56..f17fa8ade16 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=21.10.1.* +ARG version=21.9.1.* RUN apt-get update \ && apt-get install --yes --no-install-recommends \ diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile index 25f01230c5f..5da9e703f4d 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=21.10.1.* +ARG version=21.9.1.* ARG gosu_ver=1.10 # set non-empty deb_location_url url to create a docker image diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile index 62cfcf9e896..5768753cd7c 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=21.10.1.* +ARG version=21.9.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 fe14170165c..bed8eadc19c 100644 --- a/src/Storages/System/StorageSystemContributors.generated.cpp +++ b/src/Storages/System/StorageSystemContributors.generated.cpp @@ -54,7 +54,6 @@ const char * auto_contributors[] { "Alexander Sapin", "Alexander Tokmakov", "Alexander Tretiakov", - "Alexandra", "Alexandra Latysheva", "Alexandre Snarskii", "Alexandr Kondratev", @@ -96,7 +95,6 @@ const char * auto_contributors[] { "Anatoly Pugachev", "ana-uvarova", "AnaUvarova", - "Andr0901", "Andreas Hunkeler", "AndreevDm", "Andrei Bodrov", @@ -142,7 +140,6 @@ const char * auto_contributors[] { "aprudaev", "Ariel Robaldo", "Arsen Hakobyan", - "Arslan G", "ArtCorp", "Artem Andreenko", "Artemeey", @@ -338,7 +335,6 @@ const char * auto_contributors[] { "fessmage", "FgoDt", "fibersel", - "Filatenkov Artur", "filimonov", "filipe", "Filipe Caixeta", @@ -393,7 +389,6 @@ const char * auto_contributors[] { "hexiaoting", "Hiroaki Nakamura", "hotid", - "huangzhaowei", "HuFuwang", "Hui Wang", "hustnn", @@ -409,7 +404,6 @@ const char * auto_contributors[] { "Igr", "Igr Mineev", "ikarishinjieva", - "Ikko Ashimine", "ikopylov", "Ildar Musin", "Ildus Kurbangaliev", @@ -448,7 +442,6 @@ const char * auto_contributors[] { "Jacob Hayes", "jakalletti", "JaosnHsieh", - "jasine", "Jason", "javartisan", "javi", @@ -456,7 +449,6 @@ const char * auto_contributors[] { "Javi Santana", "Javi santana bot", "Jean Baptiste Favre", - "Jeffrey Dang", "jennyma", "jetgm", "Jiading Guo", @@ -510,7 +502,6 @@ const char * auto_contributors[] { "Leopold Schabel", "leozhang", "Lev Borodin", - "levie", "levushkin aleksej", "levysh", "Lewinma", @@ -643,9 +634,7 @@ const char * auto_contributors[] { "nauta", "nautaa", "Neeke Gao", - "neng.liu", "Neng Liu", - "NengLiu", "never lee", "NeZeD [Mac Pro]", "nicelulu", @@ -850,7 +839,6 @@ const char * auto_contributors[] { "TCeason", "Tema Novikov", "templarzq", - "terrylin", "The-Alchemist", "Tiaonmmn", "tiger.yan", @@ -889,7 +877,6 @@ const char * auto_contributors[] { "Veloman Yunkan", "Veniamin Gvozdikov", "Veselkov Konstantin", - "vgocoder", "vic", "vicdashkov", "Victor", @@ -938,7 +925,6 @@ const char * auto_contributors[] { "wzl", "Xianda Ke", "Xiang Zhou", - "xiedeyantu", "xPoSx", "Yağızcan Değirmenci", "yang",