Merge remote-tracking branch 'upstream/master' into fix4

This commit is contained in:
proller 2017-10-31 13:57:22 +03:00
commit 812ac4a738
2 changed files with 4 additions and 4 deletions

View File

@ -1,6 +1,6 @@
# This strings autochanged from release_lib.sh: # This strings autochanged from release_lib.sh:
set(VERSION_DESCRIBE v1.1.54306-testing) set(VERSION_DESCRIBE v1.1.54307-testing)
set(VERSION_REVISION 54306) set(VERSION_REVISION 54307)
# end of autochange # end of autochange
set (VERSION_MAJOR 1) set (VERSION_MAJOR 1)

4
debian/changelog vendored
View File

@ -1,5 +1,5 @@
clickhouse (1.1.54306) unstable; urgency=low clickhouse (1.1.54307) unstable; urgency=low
* Modified source code * Modified source code
-- <robot-metrika-test@yandex-team.ru> Sat, 28 Oct 2017 00:23:24 +0300 -- <robot-metrika-test@yandex-team.ru> Mon, 30 Oct 2017 22:35:37 +0300