thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-19 22:22:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,103 Commits 9,144 Branches 1,778 Tags 2 GiB
575a67b5d2
Commit Graph

540 Commits

Author SHA1 Message Date
Alexey Milovidov
6af8215af5 dbms: added table system.replication_queue [#METR-18061]. 2015-09-24 03:21:02 +03:00
Alexey Milovidov
0f8b651fe8 dbms: fixing error with 'nonincrement_block_numbers' [#METR-18139]. 2015-09-23 05:39:07 +03:00
Alexey Milovidov
926a661e38 Merge 2015-09-22 01:44:18 +03:00
Alexey Milovidov
c89541646c dbms: instrumenting replication queue [#METR-18061]. 2015-09-22 01:43:38 +03:00
Alexey Milovidov
5df201add2 dbms: clarification [#METR-2944]. 2015-09-22 01:33:20 +03:00
Alexey Milovidov
4e28608077 dbms: fixed error [#METR-16779]. 2015-09-21 21:47:46 +03:00
Andrey Mironov
244eabb54b dbms: allow moving primary key columns to PREWHERE if the can't be used by PKCondition [#METR-18063] 2015-09-21 15:13:11 +03:00
Alexey Milovidov
6571769d3b dbms: added setting 'select_sequential_consistency' [#METR-16779]. 2015-09-20 14:54:58 +03:00
Alexey Milovidov
3b5a3e7325 dbms: quorum insert: development [#METR-16779]. 2015-09-20 14:02:59 +03:00
Alexey Milovidov
dcf40ef7c8 dbms: addition [#METR-17573]. 2015-09-20 09:40:17 +03:00
Alexey Milovidov
b14bbf3928 Merge 2015-09-20 09:31:19 +03:00
Alexey Milovidov
227b41b0eb dbms: set queue entry time when cloning replica or repairing missing or damaged parts [#METR-18085]. 2015-09-20 08:50:15 +03:00
Alexey Milovidov
615181b3a6 dbms: added last_queue_update column to system.replicas table; clarifications [#METR-17573]. 2015-09-20 08:21:43 +03:00
Alexey Milovidov
3ea789e23f dbms: fixed log message [#METR-2944]. 2015-09-19 11:19:25 +03:00
Alexey Milovidov
b068913aeb dbms: removed bogus messages from error log; improved diagnostics; extended system.replicas table [#METR-17573]. 2015-09-19 08:56:40 +03:00
Alexey Milovidov
a53f7473d3 dbms: removed misleading error messages about canceled merges [#METR-18087]. 2015-09-18 09:39:39 +03:00
Alexey Milovidov
10b86afd3c dbms: saving create time for log entries in ZK [#METR-18085]. 2015-09-18 00:30:43 +03:00
Alexey Milovidov
b0b44b1565 dbms: removing old queue entries: continue development [#METR-18035]. 2015-09-17 00:12:59 +03:00
Alexey Milovidov
13112cc66e dbms: better [#METR-18035]. 2015-09-16 23:40:01 +03:00
Alexey Milovidov
cf7d220f10 dbms: fixed error [#METR-18035]. 2015-09-16 23:38:50 +03:00
Alexey Milovidov
d829d9fe10 dbms: clearing impossible queue entries: development [#METR-18035]. 2015-09-15 04:55:22 +03:00
Alexey Milovidov
23a11f19c7 dbms: clearing impossible entries from replication queue [#METR-18035]. 2015-09-15 04:20:40 +03:00
Alexey Milovidov
0743a87ebd dbms: clearing impossible entries from replication queue [#METR-18035]. 2015-09-15 01:45:19 +03:00
Alexey Milovidov
15a6ac31f4 dbms: quorum inserts: development [#METR-16779]. 2015-09-11 05:51:35 +03:00
Alexey Milovidov
d53f173478 dbms: quorum inserts: development [#METR-16779]. 2015-09-11 05:13:59 +03:00
Alexey Milovidov
a26a43fcc0 dbms: quorum inserts: development [#METR-16779]. 2015-09-10 23:43:42 +03:00
Alexey Milovidov
f1655cc62f Merge 2015-08-18 00:09:36 +03:00
Alexey Milovidov
8d5cd69bb2 dbms: fixed exception message [#METR-2944]. 2015-07-17 21:11:10 +03:00
Alexey Milovidov
c0e029bb1b dbms: renamed ColumnWithNameAndType to ColumnWithTypeAndName for clarification [#METR-2944]. 2015-07-17 04:27:35 +03:00
Alexey Milovidov
791cc23dd6 dbms: addition to prev. revision [#METR-17305]. 2015-07-17 00:06:45 +03:00
Alexey Milovidov
c9689b255d dbms: system.replicas: added columns 'inserts_oldest_time' and 'merges_oldest_time' [#METR-17306].. 2015-07-16 22:11:59 +03:00
Alexey Arno
992e7dc7a5 Merge 2015-07-08 02:11:30 +03:00
Alexey Arno
37f008afd0 dbms: Server: Added support for multiple time zones: part 1 (does not add any new functionality, does not change current functionality) [#METR-15618] 2015-06-26 18:11:31 +03:00
Andrey Mironov
f012d95b7a dbms: implement alter table detach unreplicated partition [#MTRSADMIN-1093] 2015-06-22 21:24:02 +03:00
Alexey Milovidov
7f0e6fd3c1 Merge 2015-06-11 03:35:36 +03:00
Alexey Milovidov
05814604de dbms: fixed error with ATTACH for replicated tables [#MTRSADMIN-1093]. 2015-06-04 05:07:30 +03:00
Alexey Milovidov
40f0a9c4d9 dbms: fixed error with false-broken parts [#METR-16545]. 2015-05-28 07:32:38 +03:00
Alexey Milovidov
0984363b9c dbms: removed passing DataTypeFactory everywhere [#METR-16545]. 2015-05-28 06:49:28 +03:00
Andrey Mironov
fb2828f256 Merge 2015-05-20 15:06:48 +03:00
Andrey Mironov
77b2ef6f81 Merge 2015-04-21 16:10:08 +03:00
Alexey Milovidov
114b3de689 dbms: cut dependencies [#METR-2944]. 2015-04-16 09:12:35 +03:00
Alexey Arno
96f33e9238 dbms: Server: Code cleanups. [#METR-15090] 2015-04-14 17:58:59 +03:00
Alexey Arno
d35e4d0e4d dbms: Server: Code cleanups. [#METR-15090] 2015-04-14 16:44:38 +03:00
Alexey Milovidov
9ec393df61 dbms: better diagnostics on syntax error [#METR-15933]. 2015-04-11 06:10:23 +03:00
Alexey Arno
b5c1932b8c Merge 2015-04-10 20:51:39 +03:00
Alexey Milovidov
75dc9db388 dbms: ALTER: writing to log just before waiting for lock [#METR-2944]. 2015-03-27 02:48:50 +03:00
Alexey Milovidov
a399504bfa dbms: removed DROP PARTITION from unreplicated data [#METR-15375]. 2015-03-20 19:13:24 +03:00
Alexey Milovidov
0828dba841 dbms: preparation [#METR-2944]. 2015-03-02 04:10:58 +03:00
Alexey Milovidov
a9eb28c07d Using std::make_unique [#METR-2807]. 2015-02-11 00:10:58 +03:00
Alexey Arno
e8902aa644 dbms: Server: queries with several replicas: fixes [#METR-14410] 2015-02-09 01:37:55 +03:00
Alexey Arno
28570a12ce dbms: Server: queries with several replicas: development [#METR-14410] 2015-02-03 16:36:13 +03:00
Alexey Milovidov
22b9ecfdea dbms: fixed error with DROP COLUMN in replicated tables [#METR-14848]. 2015-02-01 06:49:36 +03:00
Alexey Milovidov
e9232fc2fc dbms: more scalable aggregator: development [#METR-2944]. 2014-12-30 21:04:53 +03:00
Alexey Milovidov
bba4b0c66c dbms: removed rare-useful repetitive log messages [#METR-2944]. 2014-12-21 04:27:56 +03:00
Andrey Mironov
7d713ea40b dbms: compress zookeeper checksum metadata. [#MTRSADMIN-879] 2014-12-17 21:38:22 +03:00
Andrey Mironov
3ebfd2fb7f dbms: pass proper context into Storage::read(). [#METR-14179] 
This reverts commit 34b3f738a67432b44f6f69238dd1529535984d1a.
 2014-12-17 17:19:07 +03:00
Andrey Mironov
338314c9c6 dbms: stop merges on ALTER. [#METR-14032] 2014-12-17 16:14:24 +03:00
Andrey Mironov
49e322a045 Revert "dbms: pass proper context into Storage::read(). [#METR-14179]" 
This reverts commit c0800b74a6fa338d29a65111599aa1fe71b67201.
 2014-12-16 19:22:57 +03:00
Andrey Mironov
fc9472ba47 dbms: pass proper context into Storage::read(). [#METR-14179] 2014-12-16 15:40:25 +03:00
Alexey Milovidov
cea5e295d0 dbms: addition to prev. revision [#METR-14300]. 2014-12-15 07:06:39 +03:00
Alexey Milovidov
09076b30d5 Merge 2014-12-12 23:50:32 +03:00
Alexey Milovidov
03a21823db dbms: addition to prev. revision [#METR-14238]. 2014-12-11 05:04:13 +03:00
Alexey Milovidov
2aa2cb18c4 dbms: fixed error with re-initializing session in ZK [#METR-14238]. 2014-12-11 04:56:42 +03:00
Alexey Milovidov
8446069851 dbms: more simple [#METR-13953]. 2014-12-02 22:08:18 +03:00
Alexey Milovidov
d7a1abbbdc Merge 2014-11-22 05:22:30 +03:00
Andrey Mironov
50328d120a Merge 2014-11-12 13:42:04 +03:00
Andrey Mironov
731be3e7cf Merge 2014-11-12 13:37:47 +03:00
Alexey Milovidov
9a9036f217 dbms: added FREEZE PARTITION functionality [#METR-13441]. 2014-11-11 07:11:07 +03:00
Andrey Mironov
3407600536 dbms: save all columns in a single ZooKeeper node [#METR-12739] 2014-11-10 19:16:43 +03:00
Alexey Milovidov
16a1c1e6e8 Merge 2014-11-09 02:55:24 +03:00
Alexey Milovidov
c881adcaff dbms: allowed to start without ZooKeeper (in readonly mode) [#METR-2944]. 2014-11-07 04:12:55 +03:00
Alexey Milovidov
3d359e2b82 Partially get rid of time2str.h [#METR-13554]. 2014-11-06 09:32:23 +03:00
Andrey Mironov
934149d59a Merge 2014-10-23 16:16:24 +04:00
Andrey Mironov
847b91614a dbms: deduce and check types during alter, alteration of defaulted columns. [#METR-12739] 2014-10-21 16:11:20 +04:00
Alexey Milovidov
d3664eac89 dbms: added setting replication_alter_partitions_sync [#METR-13158]. 2014-10-18 23:14:09 +04:00
Alexey Milovidov
f26b265eed Merge 2014-10-18 21:37:55 +04:00
Alexey Milovidov
a097d24644 dbms: moved some code to separate file [#METR-13153]. 2014-10-17 05:05:51 +04:00
Andrey Mironov
0bfd35e5c7 dbms: defaulted columns support for ALTER, currently without type deduction and checking. 2014-10-16 17:37:01 +04:00
Alexey Milovidov
afc4f7fcf0 dbms: tiny modification [#METR-13153]. 2014-10-16 00:28:43 +04:00
Alexey Milovidov
07ba420b85 dbms: addition to prev. revision; removed support to FETCH UNREPLICATED PARTITION [#METR-13153]. 2014-10-15 23:59:12 +04:00
Alexey Milovidov
2800bf4c30 dbms: modified criteria for automatic repair [#METR-13235]. 2014-10-15 23:42:32 +04:00
Alexey Milovidov
3d7639e5f1 dbms: little better [#METR-13153]. 2014-10-15 05:22:06 +04:00
Alexey Milovidov
5fc32bb267 dbms: FETCH PARTITION: development [#METR-13153]. 2014-10-13 22:01:58 +04:00
Alexey Milovidov
21383c5475 dbms: FETCH PARTITION: development [#METR-13153]. 2014-10-13 21:28:59 +04:00
Alexey Milovidov
54636994ef dbms: FETCH PARTITION: development [#METR-13153]. 2014-10-10 04:46:37 +04:00
Alexey Milovidov
a76db2ba78 dbms: improvement [#METR-13153]. 2014-10-10 03:14:06 +04:00
Alexey Milovidov
c1601502bd dbms: FETCH PARTITION: parsing and dispatching [#METR-13153]. 2014-10-10 00:28:33 +04:00
Alexey Milovidov
48ec87bc40 dbms: fixed error with system.replicas; improvement [#METR-12726]. 2014-10-07 22:44:03 +04:00
Alexey Milovidov
bb60b4e859 dbms: fixed bad code [#METR-12726]. 2014-10-07 22:42:35 +04:00
Alexey Milovidov
468ea6e4be dbms: added table system.replicas [#METR-12726]. 2014-10-06 09:18:17 +04:00
Alexey Milovidov
90d8096a0e Merge 2014-10-03 21:57:01 +04:00
Andrey Mironov
220ce78326 dbms: support ALIAS in table declaration 2014-10-03 19:30:10 +04:00
Andrey Mironov
468b7af64e Merge 2014-10-03 14:19:34 +04:00
Alexey Milovidov
1da86169d6 dbms: more handy error message [#METR-2944]. 2014-10-03 03:31:18 +04:00
Alexey Milovidov
8afa7c1943 dbms: probably fixed error [#METR-12784]. 2014-10-01 04:11:32 +04:00
Alexey Milovidov
4b83a8d3b3 dbms: tiny modifications [#METR-12784]. 2014-10-01 00:26:10 +04:00
Andrey Mironov
8052020218 add draft version of DEFAULT, MATERIALIZED/ALIAS currently parsed but not taken into account. [#METR-12739] 2014-09-30 07:08:47 +04:00
Alexey Milovidov
995bc9a5dd dbms: investigation [#METR-12784]. 2014-09-30 00:26:46 +04:00
Alexey Milovidov
fdd34069ff dbms: probably fixed error in cyclic ALTERs [#METR-12509]. 2014-09-26 04:49:50 +04:00
Alexey Milovidov
ba0191d0fc dbms: better observability [#METR-12784]. 2014-09-25 03:35:27 +04:00
Alexey Milovidov
f2c0ba3ba2 dbms: fixed error with merges [#METR-12767]. 2014-09-18 03:57:25 +04:00
Andrey Mironov
f6f7004684 Merge 2014-09-16 14:24:33 +04:00
Alexey Milovidov
126bfa0750 dbms: tiny modifications [#METR-12729]. 2014-09-12 06:30:01 +04:00
Alexey Milovidov
887f4d052f dbms: fixed error [#METR-12729]. 2014-09-12 05:06:38 +04:00
Alexey Milovidov
0ea4691107 Merge 2014-09-12 04:32:27 +04:00
Alexey Milovidov
063b39efc0 dbms: fixed error in replication [#METR-12653]. 2014-09-11 07:13:27 +04:00
Pavel Kartavyy
5b954f7dbe probably fixed error with bad version after some kind of alter [#METR-12509] 2014-09-10 16:46:11 +04:00
Andrey Mironov
e3d8e4e48b initial implementation. [#METR-12574] 2014-09-10 15:34:26 +04:00
Alexey Milovidov
d6d163b5dc dbms: replication: writers don't block ZK session restart [#METR-12572]. 2014-09-05 00:26:14 +04:00
Alexey Milovidov
f531960561 dbms: fixed visibility of unreplicated parts [#METR-12738]. 2014-08-16 00:10:44 +04:00
Michael Kolupaev
d9ae9876ce Merge 2014-08-13 12:08:40 +04:00
Michael Kolupaev
a373267660 Merge 2014-08-12 16:41:39 +04:00
Michael Kolupaev
51992989a6 Merge 2014-08-12 13:27:00 +04:00
Michael Kolupaev
583f4c114e Merge 2014-08-11 19:59:05 +04:00
Michael Kolupaev
5e0e9bbc00 Merge 2014-08-11 18:05:42 +04:00
Michael Kolupaev
7b11fc4f6c Merge 2014-08-11 18:05:42 +04:00
Michael Kolupaev
eaf4a79f11 Merge 2014-08-08 16:53:59 +04:00
Michael Kolupaev
6189e53667 Merge 2014-08-08 14:57:33 +04:00
Michael Kolupaev
3c75c3f774 Merge 2014-08-08 14:46:38 +04:00
Michael Kolupaev
19ca334f9c Merge 2014-08-08 14:42:27 +04:00
Michael Kolupaev
dbe4dc64f3 Merge 2014-08-08 14:41:53 +04:00
Michael Kolupaev
08340ff6a0 Merge 2014-08-08 14:28:46 +04:00
Michael Kolupaev
71b90ea1d4 Merge 2014-08-08 14:03:19 +04:00
Michael Kolupaev
83812f5ed5 Merge 2014-08-08 14:02:54 +04:00
Michael Kolupaev
4025face46 Merge 2014-08-08 13:58:56 +04:00
Michael Kolupaev
a33ab0b36c Merge 2014-08-07 16:26:04 +04:00
Michael Kolupaev
9bec7e4a28 Merge 2014-08-07 16:26:04 +04:00
Michael Kolupaev
7643a49b8e Merge 2014-08-07 16:26:04 +04:00
Michael Kolupaev
98297fa475 Merge 2014-08-07 16:26:03 +04:00
Michael Kolupaev
3adfe8d536 Merge 2014-08-05 12:57:25 +04:00
Michael Kolupaev
6fd0f417b4 Merge 2014-08-04 19:48:03 +04:00
Michael Kolupaev
9a50694f22 Merge 2014-08-04 18:23:52 +04:00
Michael Kolupaev
0b37543bd8 Merge 2014-08-01 13:53:03 +04:00
Michael Kolupaev
757aa8891d Merge 2014-08-01 13:45:59 +04:00
Michael Kolupaev
2bd9733223 Merge 2014-07-30 16:10:38 +04:00
Michael Kolupaev
9b3ce7f0f8 Refactored VirtualColumnUtils. [#METR-12036] 2014-07-29 19:21:09 +04:00
Michael Kolupaev
8a41d7985a Merge 2014-07-28 18:50:51 +04:00
Michael Kolupaev
2854ed49da Merge 2014-07-28 18:50:51 +04:00
Michael Kolupaev
d660d7db45 Merge 2014-07-28 14:36:15 +04:00
Michael Kolupaev
53a76dd348 Merge 2014-07-28 14:36:14 +04:00
Michael Kolupaev
c832fc00aa Merge 2014-07-25 20:32:02 +04:00
Michael Kolupaev
219e3ca3c6 Merge 2014-07-25 20:10:02 +04:00
Michael Kolupaev
18eb2d8b8f Merge 2014-07-25 18:31:55 +04:00
Michael Kolupaev
0c5e87bce8 Merge 2014-07-25 17:28:49 +04:00
Michael Kolupaev
1f1e0fcc67 Merge 2014-07-25 17:12:14 +04:00
Michael Kolupaev
354bf02bf6 Merge 2014-07-25 17:12:14 +04:00
Michael Kolupaev
8142941b42 Merge 2014-07-25 17:12:14 +04:00
Michael Kolupaev
13b9392241 Merge 2014-07-25 17:12:14 +04:00
Michael Kolupaev
85c722caf3 Merge 2014-07-25 17:12:14 +04:00
Michael Kolupaev
a6e8c35ba8 Merge 2014-07-25 11:49:02 +04:00
Michael Kolupaev
7b44c88b73 Merge 2014-07-23 20:31:38 +04:00
Michael Kolupaev
90dc182f12 Merge 2014-07-23 19:24:51 +04:00
Michael Kolupaev
6c4b3e3379 Merge 2014-07-23 17:58:38 +04:00
Michael Kolupaev
272a2a8d9b Merge 2014-07-23 16:44:23 +04:00
Michael Kolupaev
8b18acffec Merge 2014-07-23 15:02:22 +04:00
Michael Kolupaev
bfe126ab04 Merge 2014-07-23 13:50:29 +04:00
Michael Kolupaev
f3285dba79 Merge 2014-07-23 13:15:41 +04:00
Michael Kolupaev
16e5a92ed9 Merge 2014-07-22 17:49:52 +04:00
Michael Kolupaev
776f11a256 Merge 2014-07-22 14:36:56 +04:00
Michael Kolupaev
68ff148170 Merge 2014-07-18 20:06:02 +04:00
Michael Kolupaev
4f3b1a476f Merge 2014-07-18 19:41:04 +04:00
Michael Kolupaev
e493438564 Merge 2014-07-17 14:44:17 +04:00
Michael Kolupaev
67b76568d3 Merge 2014-07-17 13:38:31 +04:00
Michael Kolupaev
12c6d16743 Merge 2014-07-16 13:32:15 +04:00
Michael Kolupaev
22c0c1778e Merge 2014-07-16 12:58:59 +04:00
Michael Kolupaev
d668fd27d2 Merge 2014-07-15 19:51:27 +04:00
Michael Kolupaev
5b7b7a0bb8 Merge 2014-07-15 18:48:50 +04:00
Michael Kolupaev
86fb1eee37 Merge 2014-07-15 18:37:49 +04:00
Michael Kolupaev
39b675167d Merge 2014-07-15 15:42:06 +04:00
Michael Kolupaev
9ced1d909e Merge 2014-07-15 15:12:58 +04:00
Michael Kolupaev
01094ec78d Merge 2014-07-15 14:13:36 +04:00
Michael Kolupaev
007c0cedc1 fixed build and a bunch of other stuff. [#METR-11886] 2014-07-14 19:49:03 +04:00
Michael Kolupaev
ac7ee44128 Merge 2014-07-10 14:16:50 +04:00
Michael Kolupaev
c335519c9c Merge 2014-07-10 12:40:59 +04:00
Michael Kolupaev
a6fd9cd2bd Merge 2014-07-09 17:39:19 +04:00
Michael Kolupaev
0a67d151bd dbms: updated all usages of NamesAndTypesPair to new field names. [#METR-10202] 2014-07-09 15:54:26 +04:00
Michael Kolupaev
c0bb5e8ce3 Merge 2014-07-08 18:41:19 +04:00
Michael Kolupaev
639d1ad15f Merge 2014-07-07 15:39:06 +04:00
Michael Kolupaev
b40f8bd8d5 Merge 2014-07-07 13:51:42 +04:00
Michael Kolupaev
ae5ea95a73 Merge 2014-07-04 18:07:14 +04:00
Michael Kolupaev
7362ca686f Merge 2014-07-04 17:59:05 +04:00
Michael Kolupaev
d00dc44397 Merge 2014-07-04 17:15:28 +04:00
Michael Kolupaev
1425813cdf Merge 2014-07-04 15:18:04 +04:00
Michael Kolupaev
95fd8c88f1 Merge 2014-07-03 18:22:50 +04:00
Michael Kolupaev
acfa0d2b46 Merge 2014-07-03 11:48:05 +04:00
Michael Kolupaev
15d9e39aa6 Merge 2014-07-02 16:30:38 +04:00
Michael Kolupaev
601732a0dd Merge 2014-07-02 14:16:49 +04:00
Michael Kolupaev
faafb36596 Merge 2014-07-01 19:58:25 +04:00
Michael Kolupaev
68b077b8f5 Merge 2014-06-30 17:57:20 +04:00
Alexey Milovidov
108a7850a5 dbms: improved performance on short queries [#METR-11571]. 2014-06-26 04:58:14 +04:00
Pavel Kartavyy
7b62758dcf dbms: fix to compability with new zkutil 2014-06-11 21:29:04 +04:00
Michael Kolupaev
3aad8dad8f Merge 2014-05-27 16:08:40 +04:00
Michael Kolupaev
cf2843d22c Merge 2014-05-27 14:03:13 +04:00
Michael Kolupaev
4c771903d7 Merge 2014-05-26 22:29:29 +04:00
Michael Kolupaev
ecf8e8b43c Merge 2014-05-26 22:27:25 +04:00
Michael Kolupaev
c1b265d4ac Merge 2014-05-26 22:16:05 +04:00
Michael Kolupaev
f137d7b84d Merge 2014-05-26 22:16:04 +04:00
Michael Kolupaev
b830e0b4fe Merge 2014-05-26 22:16:04 +04:00
Michael Kolupaev
77589b0c6e Merge 2014-05-22 14:37:17 +04:00
Michael Kolupaev
ed26098886 Merge 2014-05-14 21:51:43 +04:00
Michael Kolupaev
4e2f2eca05 dbms: small fix. [#METR-2807] 2014-05-14 18:20:34 +04:00
Michael Kolupaev
728bdf4928 Merge 2014-05-13 15:24:16 +04:00
Michael Kolupaev
f17b46548c fixed build. [#METR-10202] 2014-05-13 14:34:45 +04:00
Michael Kolupaev
90e93b171d Merge 2014-05-13 14:10:26 +04:00
Michael Kolupaev
be5a9cf820 Merge 2014-05-08 17:27:18 +04:00
Michael Kolupaev
6232f3e9b4 Merge 2014-05-08 12:03:03 +04:00
Michael Kolupaev
ea9e8964f0 Merge 2014-05-08 11:12:01 +04:00
Michael Kolupaev
5a5cfa31f1 Merge 2014-05-07 18:12:15 +04:00
Michael Kolupaev
0b7928f6a9 Merge 2014-05-07 17:58:20 +04:00
Michael Kolupaev
8bd16d3361 Merge 2014-04-24 14:20:02 +04:00
Michael Kolupaev
dba95b4de5 Merge 2014-04-22 15:20:02 +04:00
Michael Kolupaev
68049a0162 Merge 2014-04-18 13:55:25 +04:00
Michael Kolupaev
07d9ab9bbf Merge 2014-04-14 17:13:20 +04:00
Michael Kolupaev
3dc646c066 Merge 2014-04-14 17:08:26 +04:00
Michael Kolupaev
ee6a647245 Merge 2014-04-14 14:56:06 +04:00
Michael Kolupaev
b9c4a3419a Merge 2014-04-14 14:19:38 +04:00
Michael Kolupaev
524f376b2d Merge 2014-04-09 20:32:40 +04:00
Michael Kolupaev
e3dfe90ffe Merge 2014-04-09 19:53:47 +04:00
Michael Kolupaev
f0b55713f5 Merge 2014-04-08 21:45:27 +04:00
Michael Kolupaev
b0edb3b470 Fixes. [#METR-10202] 2014-04-07 22:44:10 +04:00
Michael Kolupaev
afafcc85b4 Fixes. [#METR-10202] 2014-04-07 22:14:39 +04:00
Michael Kolupaev
28ff474916 Fixes. [#METR-10202] 2014-04-07 21:39:45 +04:00
Michael Kolupaev
4e975b43ec Merge 2014-04-07 19:45:46 +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
1b5b9a1f1e Merge 2014-04-04 16:47:57 +04:00
Michael Kolupaev
847128152e Merge 2014-04-04 14:37:33 +04:00
Michael Kolupaev
95fc39c559 Merge 2014-04-03 17:30:21 +04:00
Michael Kolupaev
b00c303f7d Merge 2014-04-03 17:11:11 +04:00
Michael Kolupaev
50ba6ca8e1 Merge 2014-04-03 16:49:01 +04:00
Michael Kolupaev
b4d85c1676 Merge 2014-04-03 15:48:28 +04:00
Michael Kolupaev
5a0aab3bb2 Merge 2014-04-03 12:47:59 +04:00
Michael Kolupaev
b92f1ff480 Merge 2014-04-02 17:45:39 +04:00
Michael Kolupaev
997875d7d1 Merge 2014-04-02 14:10:37 +04:00
Michael Kolupaev
8fc53a7020 Merge 2014-04-02 11:59:43 +04:00
Michael Kolupaev
a202cb4eaf Merge 2014-03-25 18:06:40 +04:00
Michael Kolupaev
7b6ce30656 Merge 2014-03-22 18:44:44 +04:00
Michael Kolupaev
36b152f2b1 Added interserver IO host and port to context. [#METR-10202] 2014-03-21 23:49:27 +04:00
Michael Kolupaev
7084f03ab9 Merge 2014-03-21 23:17:59 +04:00
Michael Kolupaev
750cb44f94 Merge 2014-03-21 17:42:14 +04:00