Alexey Zatelepin c9bb986330 Merge branch 'master' into replicated-mergetree-mutations ... Conflicts: dbms/src/Storages/MergeTree/AbandonableLockInZooKeeper.h dbms/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h dbms/src/Storages/StorageReplicatedMergeTree.cpp		2018-05-31 18:52:42 +03:00
..
external_dictionaries	Fix double free in LibraryDictionarySource (#2028)	2018-03-14 02:13:39 +03:00
external_models/catboost
instructions	Modifications after removing libzookeeper [#CLICKHOUSE-2]	2018-04-02 02:16:41 +03:00
integration	Merge branch 'master' into replicated-mergetree-mutations	2018-05-31 18:52:42 +03:00
perf_drafts	Add --silent mode for clickhouse-local. [#CLICKHOUSE-3390]	2018-01-15 18:08:54 +03:00
performance	Revert "ISSUES-1885 UTF8 countCodePoints use SIMD"	2018-04-20 22:18:24 +03:00
queries	Allow merges after CLEAR COLUMN. [#CLICKHOUSE-3]	2018-05-31 17:14:50 +03:00
.gitignore
clickhouse-client.xml	Fix test 00505_secure with random ports (#2433)	2018-05-28 23:38:46 +03:00
clickhouse-test	pbuilder: use random ports for testing (#2424)	2018-05-25 21:05:30 +03:00
clickhouse-test-server	Build fixes	2018-05-29 20:54:48 +03:00
client-test.xml	Allow use encryption for distributed tables (#2065)	2018-03-29 04:41:06 +03:00
CMakeLists.txt	better test in pbuilder (#2080)	2018-03-20 20:24:39 +03:00
CTestCustom.cmake	Try fix travis. Use less travis tests (#1897)	2018-02-13 21:00:06 +03:00
server-test.xml	gcc8 fixes (memset, uncaught_exception)	2018-05-08 22:44:54 +03:00
users.xml	Enable travis (#1772)	2018-01-15 21:57:10 +03:00