shengjun.li 4f8c4cacda 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-12 11:18:18 +08:00

..

build-support

Add http server (#956)

2020-01-13 13:55:48 +08:00

cmake

Error out when index SQ8H run in CPU mode (#2204)

2020-04-30 15:22:29 +00:00

conf

Caiyd 090 rename config (#2340)

2020-05-15 20:54:34 +08:00

scripts

* remove log_config from code and script

2020-06-10 15:05:35 +08:00

src

fix merge result (#2463)

2020-06-12 11:18:18 +08:00

thirdparty

Fix show partitions failed in http module (fix #2228) (#2234)

2020-05-10 12:49:26 +00:00

unittest

fix merge result (#2463)

2020-06-12 11:18:18 +08:00

.gitignore

Allow system conf modifiable and some take effect directly #1263 (#1287)

2020-02-26 18:54:32 +08:00

build.sh

Config upgrade (#2281)

2020-05-10 22:55:46 +08:00

centos7_build_deps.sh

[skip ci] remove 'openblas-devel' (#2208)

2020-05-06 21:39:14 +08:00

CMakeLists.txt

Config upgrade (#2281)

2020-05-10 22:55:46 +08:00

coverage.sh

Reside src/external in thirdparty

2019-11-13 16:35:37 +08:00

start_server.sh

* remove log_config from code and script

2020-06-10 15:05:35 +08:00

stop_server.sh

re-organize project

2019-10-14 09:51:48 +08:00

ubuntu_build_deps.sh

rm libopenblsa-dev (#2235)

2020-05-06 21:46:33 +08:00