14 Commits

Author	SHA1	Message	Date
Andrey Mironov	1713846472	dbms: fix merge blocker. [#METR-14032]	2014-12-19 17:18:56 +03:00
Andrey Mironov	338314c9c6	dbms: stop merges on ALTER. [#METR-14032]	2014-12-17 16:14:24 +03:00
Andrey Mironov	e3d8e4e48b	initial implementation. [#METR-12574]	2014-09-10 15:34:26 +04:00
Michael Kolupaev	e9ef0705f3	Merge	2014-08-04 18:23:52 +04:00
Michael Kolupaev	faafb36596	Merge	2014-07-01 19:58:25 +04:00
Michael Kolupaev	df4c963bc1	Merge	2014-05-21 14:20:41 +04:00
Michael Kolupaev	ed26098886	Merge	2014-05-14 21:51:43 +04:00
Michael Kolupaev	90e93b171d	Merge	2014-05-13 14:10:26 +04:00
Michael Kolupaev	ea9e8964f0	Merge	2014-05-08 11:12:01 +04:00
Michael Kolupaev	4a45c7c089	Merge	2014-04-04 21:20:45 +04:00
Michael Kolupaev	954a97764c	Merge	2014-04-04 17:27:47 +04:00
Michael Kolupaev	847128152e	Merge	2014-04-04 14:37:33 +04:00
Michael Kolupaev	00d9c28571	Merge	2014-03-13 21:44:00 +04:00
Michael Kolupaev	36a86a4fc9	Merge	2014-03-13 16:48:07 +04:00