Alexey Zatelepin 6bb34a4494 Merge branch 'master' into arbitrary-partitioning ... Conflicts: dbms/src/Storages/StorageFactory.cpp		2017-10-24 17:23:18 +03:00
..
external_dictionaries	Tests: External: rename --use_http => --no_http and fix (#1324)	2017-10-06 18:58:24 +03:00
instructions	Implemented some suggestions from clang-tidy (part 4) [#CLICKHOUSE-3301].	2017-09-08 07:10:43 +03:00
integration	increased timeout for test_insertion_sync_fails_with_timeout	2017-10-23 16:56:42 +03:00
perf_drafts	Fool's day changed, continued [#CLICKHOUSE-3].	2017-04-05 14:52:23 +03:00
performance	Added performance test [#CLICKHOUSE-2].	2017-08-05 07:13:23 +03:00
queries	Merge branch 'master' into arbitrary-partitioning	2017-10-24 17:23:18 +03:00
.gitignore	Added gitignore [#METR-2944].	2014-03-24 04:37:39 +04:00
clickhouse-client.xml	Changed tabs to spaces in code [#CLICKHOUSE-3].	2017-04-01 11:35:09 +03:00
clickhouse-test	Improve tests: allow redefine some values (clickhouse path, ports, ...)	2017-10-12 22:48:39 +03:00
CMakeLists.txt	LibDictionarySource : First lib dictionary version with only uint64 type support (#1150)	2017-09-05 04:08:26 +03:00