ClickHouse/dbms/src/Storages
Alexey Milovidov e97ecb6cf7 Merge branch 'master' into METR-19266
Conflicts:
	dbms/CMakeLists.txt
	dbms/include/DB/Functions/FunctionsArray.h
	dbms/include/DB/Functions/FunctionsString.h
	dbms/include/DB/Parsers/ExpressionListParsers.h
	dbms/include/DB/Storages/MergeTree/MergeTreeBlockInputStream.h
	dbms/include/DB/Storages/MergeTree/MergeTreeReader.h
	dbms/include/DB/Storages/MergeTree/MergeTreeThreadBlockInputStream.h
	dbms/include/DB/Storages/MergeTree/MergedBlockOutputStream.h
	dbms/src/Core/ErrorCodes.cpp
	dbms/src/Parsers/ASTFunction.cpp
	dbms/src/Storages/MergeTree/MergeTreeData.cpp
	dbms/src/Storages/MergeTree/MergeTreeDataPart.cpp
	dbms/src/Storages/MergeTree/MergeTreeReader.cpp
	dbms/src/Storages/StorageLog.cpp
2016-12-10 07:51:36 +03:00
..
Distributed Added abilty to automatically update clusters configuration. [#METR-22802] 2016-10-11 17:17:49 +03:00
MergeTree Merge branch 'master' into METR-19266 2016-12-10 07:51:36 +03:00
System Preparation [#METR-23747]. 2016-12-08 05:49:04 +03:00
tests Simplified LevelMergeSelector [#METR-21504]. 2016-12-06 00:34:46 +03:00
AlterCommands.cpp dbms: Server: fix [#METR-19266] 2016-10-18 22:31:07 +03:00
CMakeLists.txt cmake: More options. [#METR-23701] 2016-12-05 15:43:14 +03:00
ColumnsDescription.cpp Squashed commit of the following: 2016-02-16 19:39:39 +03:00
ITableDeclaration.cpp Better [#METR-22173]. 2016-08-05 05:28:34 +03:00
StorageBuffer.cpp Better [#METR-2944]. 2016-11-20 15:43:20 +03:00
StorageCloud.cpp use std::enable_shared_from_this for IStorage 2016-08-29 16:28:34 +03:00
StorageDistributed.cpp Added requested PR changes. [#METR-22802] 2016-10-14 20:54:18 +03:00
StorageFactory.cpp Added requested PR changes, 2nd iteration. 2016-11-14 02:57:18 +03:00
StorageFile.cpp Added requested PR changes, 2nd iteration. 2016-11-14 02:57:18 +03:00
StorageJoin.cpp Compatibility with new parser and AST of tables list [#METR-2944]. 2016-07-22 23:39:28 +03:00
StorageLog.cpp Merge branch 'master' into METR-19266 2016-12-10 07:51:36 +03:00
StorageMaterializedView.cpp rename ext::share_ptr_helper -> ext::shared_ptr_helper 2016-08-30 22:27:15 +03:00
StorageMemory.cpp use std::enable_shared_from_this for IStorage 2016-08-29 16:28:34 +03:00
StorageMerge.cpp use std::enable_shared_from_this for IStorage 2016-08-29 16:28:34 +03:00
StorageMergeTree.cpp merge upstream 2016-11-23 01:33:02 +03:00
StorageReplicatedMergeTree.cpp Merge branch 'master' into METR-19266 2016-12-10 07:51:36 +03:00
StorageSet.cpp Preparation [#METR-2944]. 2016-10-25 09:49:24 +03:00
StorageStripeLog.cpp Preparation [#METR-2944]. 2016-10-25 09:49:24 +03:00
StorageTinyLog.cpp Merge branch 'master' into METR-19266 2016-12-10 07:51:36 +03:00
StorageView.cpp use std::enable_shared_from_this for IStorage 2016-08-29 16:28:34 +03:00
VirtualColumnFactory.cpp Using std::shared_ptr for data types [#METR-21503]. 2016-05-28 10:48:40 +03:00