admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-07 19:31:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

solve conflict

Browse Source 
Former-commit-id: 62294779efb44ed0dc4e248493482d4c7cc3e016
This commit is contained in:
Xiangyu Wang 2019-06-17 17:56:49 +08:00
commit d35b51f564
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpp/CHANGELOG.md
View File

@ -6,6 +6,7 @@ Please mark all change in change log and use the ticket from JIRA.
## Bug
- MS-80 - Fix server hang issue
- MS-89 - Fix compile failed, libgpufaiss.a link missing
- MS-90 - Fix arch match incorrect on ARM
## Improvement

1
cpp/src/CMakeLists.txt
View File

@ -62,6 +62,7 @@ set(third_party_libs
sqlite
thrift
yaml-cpp
gpufaiss
faiss
lapack
openblas