mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-21 01:00:48 +00:00
Merge branch 'master' of github.com:yandex/ClickHouse
This commit is contained in:
commit
d8c528ea39
@ -2,10 +2,10 @@
|
|||||||
set(VERSION_REVISION 54407 CACHE STRING "")
|
set(VERSION_REVISION 54407 CACHE STRING "")
|
||||||
set(VERSION_MAJOR 18 CACHE STRING "")
|
set(VERSION_MAJOR 18 CACHE STRING "")
|
||||||
set(VERSION_MINOR 12 CACHE STRING "")
|
set(VERSION_MINOR 12 CACHE STRING "")
|
||||||
set(VERSION_PATCH 3 CACHE STRING "")
|
set(VERSION_PATCH 4 CACHE STRING "")
|
||||||
set(VERSION_GITHASH 4032e4d22c50b2e3775a765415e8d051ba50a4ca CACHE STRING "")
|
set(VERSION_GITHASH b82d532db089055bb0cf0dba5c480295b5733287 CACHE STRING "")
|
||||||
set(VERSION_DESCRIBE v18.12.3-testing CACHE STRING "")
|
set(VERSION_DESCRIBE v18.12.4-testing CACHE STRING "")
|
||||||
set(VERSION_STRING 18.12.3 CACHE STRING "")
|
set(VERSION_STRING 18.12.4 CACHE STRING "")
|
||||||
# end of autochange
|
# end of autochange
|
||||||
|
|
||||||
set(VERSION_EXTRA "" CACHE STRING "")
|
set(VERSION_EXTRA "" CACHE STRING "")
|
||||||
|
4
debian/changelog
vendored
4
debian/changelog
vendored
@ -1,5 +1,5 @@
|
|||||||
clickhouse (18.12.3) unstable; urgency=low
|
clickhouse (18.12.4) unstable; urgency=low
|
||||||
|
|
||||||
* Modified source code
|
* Modified source code
|
||||||
|
|
||||||
-- <root@yandex-team.ru> Wed, 05 Sep 2018 21:49:34 +0300
|
-- <root@yandex-team.ru> Thu, 06 Sep 2018 05:32:40 +0300
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
FROM ubuntu:18.04
|
FROM ubuntu:18.04
|
||||||
|
|
||||||
ARG repository="deb http://repo.yandex.ru/clickhouse/deb/stable/ main/"
|
ARG repository="deb http://repo.yandex.ru/clickhouse/deb/stable/ main/"
|
||||||
ARG version=18.12.3
|
ARG version=18.12.4
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y apt-transport-https dirmngr && \
|
apt-get install -y apt-transport-https dirmngr && \
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
FROM ubuntu:18.04
|
FROM ubuntu:18.04
|
||||||
|
|
||||||
ARG repository="deb http://repo.yandex.ru/clickhouse/deb/stable/ main/"
|
ARG repository="deb http://repo.yandex.ru/clickhouse/deb/stable/ main/"
|
||||||
ARG version=18.12.3
|
ARG version=18.12.4
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y apt-transport-https dirmngr && \
|
apt-get install -y apt-transport-https dirmngr && \
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
FROM ubuntu:18.04
|
FROM ubuntu:18.04
|
||||||
|
|
||||||
ARG repository="deb http://repo.yandex.ru/clickhouse/deb/stable/ main/"
|
ARG repository="deb http://repo.yandex.ru/clickhouse/deb/stable/ main/"
|
||||||
ARG version=18.12.3
|
ARG version=18.12.4
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y apt-transport-https dirmngr && \
|
apt-get install -y apt-transport-https dirmngr && \
|
||||||
|
Loading…
Reference in New Issue
Block a user