shengjun.li 257ea7782f

fix merge result (#2463) ...

* fix merge result

Signed-off-by: shengjun.li <shengjun.li@zilliz.com>

* fix tests

Signed-off-by: shengjun.li <shengjun.li@zilliz.com>

2020-06-01 07:31:58 +00:00

..

db

fix merge result (#2463)

2020-06-01 07:31:58 +00:00

metrics

performance issues (#2438)

2020-05-28 00:19:08 +08:00

scheduler

rename optimizer to selector (#2067)

2020-04-24 11:42:17 +00:00

server

Fix inconsistent reading and writing when using mishards (# 2367) (#2442)

2020-05-29 13:32:49 +08:00

storage

Caiyd 1881 bad alloc (#1892)

2020-04-09 17:13:15 +08:00

thirdparty

Delete and WAL feature branch merge (#1436)

2020-02-29 16:11:31 +08:00

CMakeLists.txt

Merge strategy (#2277)

2020-05-11 01:38:50 +00:00

main.cpp

#1240 Update license declaration of each file (#1241)

2020-02-17 23:40:58 +08:00