peng.xu
|
72dd8f7a92
|
Merge branch 'update_knowhere' into 'branch-0.4.0'
MS-298 Update knowhere
See merge request megasearch/milvus!287
Former-commit-id: 24f713388b6037222566f328d035f15bf763a1c2
|
2019-07-30 15:38:03 +08:00 |
|
quicksilver
|
6e190d78b7
|
MS-299 - Update Milvus Version to branch-0.4.0
Former-commit-id: 4fd843cc6f2a830377d6c7c98e4097af463b5b0d
|
2019-07-30 15:37:33 +08:00 |
|
xj.lin
|
08e0aa836c
|
remove faiss build useless gpu-arch
Former-commit-id: 4c79e50367d25a5336138fe90815d6488ff5244e
|
2019-07-30 15:34:44 +08:00 |
|
xj.lin
|
9232625a93
|
replace knowhere with megasearch/knowhere
Former-commit-id: ebc5f2dedbdc9fc7efdeecd8f2457f40829bbb31
|
2019-07-30 15:18:26 +08:00 |
|
xj.lin
|
7d782dbb9f
|
remove personal project knowhere
Former-commit-id: 9d030089606c110f0a42159fb5200ae2fbbefcc5
|
2019-07-30 15:12:45 +08:00 |
|
Jeff
|
d04440294c
|
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-297: disable mysql unit test
See merge request megasearch/milvus!286
Former-commit-id: 74d0f3f6a2c661a5ace48e5507fb75df963a1a88
|
2019-07-30 13:57:01 +08:00 |
|
zhiru
|
b06cc9fe02
|
disable mysql unit test
Former-commit-id: 4f07286e00ceabe8fb700206ff45bbdda6bfe8d9
|
2019-07-30 13:53:45 +08:00 |
|
zhiru
|
c16eabb538
|
disable mysql unit test
Former-commit-id: da61f1ae35c9ed2d8a363ffd2e85dfb634ae4b32
|
2019-07-30 13:51:59 +08:00 |
|
zhiru
|
6dd6798433
|
disable mysql unit test
Former-commit-id: cc3158053f3735e701d6c3de940eebeb25abafdd
|
2019-07-30 13:50:21 +08:00 |
|
kun yu
|
24a32a1c68
|
Merge branch 'branch-0.3.1' into branch-0.4.0
Former-commit-id: 89766cb15b69b48e0472a6aa11fb9744d31ff0b0
|
2019-07-30 10:37:29 +08:00 |
|
kun yu
|
5cf5708441
|
add error handle
Former-commit-id: 54393cf38c6436d7985a2a0fdc8609501fdf2c6a
|
2019-07-30 10:37:01 +08:00 |
|
kun yu
|
77e1ddd81b
|
branch-0.4.0
Former-commit-id: a4df63653202df32d0b983de27f5c969905d17ac
|
2019-07-30 10:23:34 +08:00 |
|
kun yu
|
c1e2be2ea3
|
Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: aa2118d011049c865cf0eccc616de518af3ae20f
|
2019-07-29 20:17:46 +08:00 |
|
kun yu
|
dfb35391ba
|
fix error handle while using stream
Former-commit-id: 2400cb8c1dea0a0c1b6de5a9a653c639122e2ecd
|
2019-07-29 20:17:10 +08:00 |
|
jinhai
|
71c177227a
|
Merge branch 'update_jenkins_scripts' into 'branch-0.4.0'
MS-295 update jenkins-scripts
See merge request megasearch/milvus!285
Former-commit-id: c072b20d593a20f38166ee2489211a6297276cd5
|
2019-07-29 20:04:00 +08:00 |
|
xj.lin
|
17db7c8d7b
|
MS-295 update jenkins-scripts
Former-commit-id: de8984c63956b40e39d8798c245ab0e6dea1c5e5
|
2019-07-29 19:55:48 +08:00 |
|
kun yu
|
593010fd91
|
fix search error handle bug
Former-commit-id: f205dec24e64f3380a71699e0148789559301d92
|
2019-07-29 18:50:41 +08:00 |
|
kun yu
|
b9c11671c4
|
fix search error handle bug
Former-commit-id: dfded9c68611b0622581deebd1e94363566af432
|
2019-07-29 18:05:14 +08:00 |
|
kun yu
|
0c580bfa13
|
fix conflict
Former-commit-id: b1ebf9db86289bcb6afd9f30c3525b0df40433d6
|
2019-07-29 11:40:27 +08:00 |
|
kun yu
|
125191557c
|
add empty and dim check
Former-commit-id: 319232d98f8c22d600ef31001a3798fff4dc18dc
|
2019-07-29 10:58:07 +08:00 |
|
jinhai
|
256b3702dc
|
Merge branch 'branch-0.3.1' into branch-0.4.0
Former-commit-id: 6445b9ad1ec8db0fa1399563f187d206df04c63d
|
2019-07-28 09:55:56 +08:00 |
|
jinhai
|
3715ccb6a6
|
Merge branch 'branch-0.3.1' into 'branch-0.3.1'
parallel reduce default false
See merge request megasearch/milvus!282
Former-commit-id: 0726e6bdbc3af658d4757aacb96fe2668f7c0bc0
|
2019-07-28 09:55:32 +08:00 |
|
jinhai
|
5740985e0e
|
Merge branch 'branch-0.3.1-xiaojun' into branch-0.4.0
Former-commit-id: a4c620656251f284789bead020c70a8fd64b4143
|
2019-07-28 09:30:31 +08:00 |
|
kun yu
|
95df40dd17
|
Merge remote-tracking branch 'upstream/branch-0.3.1' into without-grpc-vers
DFHN
Former-commit-id: 518029590606985fe9693f59ce099dd059390c1f
|
2019-07-27 16:48:09 +08:00 |
|
kun yu
|
54a71a9fa0
|
add CPU metrics
Former-commit-id: bb2dffc5abb87340a58a4791a23e55858073531f
|
2019-07-27 16:48:04 +08:00 |
|
kun yu
|
691df6ed18
|
add CPU_usage_rate Metrics
Former-commit-id: a2a914159d759f9724b70954758cd22d7d5c98ff
|
2019-07-27 16:19:34 +08:00 |
|
peng.xu
|
028850d0ca
|
Merge branch 'integrate_knowhere' into 'branch-0.3.1-xiaojun'
MS-288 update build stage
See merge request megasearch/milvus!283
Former-commit-id: 34dafeebfd64100ee77e62d4bd142ce3c8dd57c9
|
2019-07-27 14:34:17 +08:00 |
|
xj.lin
|
3314d47114
|
MS-288 update build stage
Former-commit-id: d9e0bfbbbb5060b65311b2f6eb8eadf531b918c2
|
2019-07-27 14:30:52 +08:00 |
|
starlord
|
4fc8921183
|
parallel reduce default false
Former-commit-id: 863941e425c4c2653367d2da6f13bebcb2b5eb96
|
2019-07-26 19:31:02 +08:00 |
|
jinhai
|
469b639469
|
Merge branch 'integrate_knowhere' into 'branch-0.3.1-xiaojun'
MS-286 fix..
See merge request megasearch/milvus!281
Former-commit-id: ab2892036ea2e84f8036bf0918a42c4917d77f64
|
2019-07-26 17:57:27 +08:00 |
|
xj.lin
|
66119dd20f
|
MS-286 fix..
Former-commit-id: 056d394c7aff7f05ac5519a626e60e77e576fb63
|
2019-07-26 17:45:14 +08:00 |
|
kun yu
|
92467dc304
|
fix HasTable bug
Former-commit-id: 32797d1bbbdd953a492cabf7727dcedceb37e7a5
|
2019-07-26 15:39:17 +08:00 |
|
jinhai
|
cf2aed57f4
|
Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-260 Refine log
See merge request megasearch/milvus!280
Former-commit-id: 342de0cd5859636f3ee26b4777c4a196f32acb16
|
2019-07-26 13:07:39 +08:00 |
|
jinhai
|
fc0cf0a1f2
|
Merge branch 'fix-bug-without-grpc' into 'branch-0.3.1'
fix quries/minute bug
See merge request megasearch/milvus!279
Former-commit-id: 6285b0b1a0d381771d4b44187f82e3344581ea81
|
2019-07-26 13:07:27 +08:00 |
|
starlord
|
b5816a386c
|
MS-260 Refine log
Former-commit-id: 0fbaa027ff33645bae10ce31ecd9ffa3c17894df
|
2019-07-26 12:29:36 +08:00 |
|
starlord
|
bf8f5cca34
|
MS-260 Refine log
Former-commit-id: a67b4e677a6ad1b46a793119d19a6da85f2441c4
|
2019-07-26 12:26:45 +08:00 |
|
kun yu
|
f74f9bb08c
|
fix errorcode bug
Former-commit-id: a96852ef86254e08549a683c65c6ec797a782b74
|
2019-07-26 11:51:08 +08:00 |
|
kun yu
|
bc08eb278a
|
Merge branch 'branch-0.3.1' of 192.168.1.105:kun.yu/milvus into branch-0.3.1
Former-commit-id: 41b048b5c475833a6b7dc7aa52141447b855beaf
|
2019-07-26 11:25:27 +08:00 |
|
kun yu
|
805aef38af
|
fix quries/minute bug
Former-commit-id: 63f4de823b290d346f4133d70e9a834054e12688
|
2019-07-26 11:19:51 +08:00 |
|
jinhai
|
d98f0549b2
|
Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-275 Avoid sqlite logic error excetion
See merge request megasearch/milvus!278
Former-commit-id: 2bd20e7b00d755590f3ab3819067be88d687b7a9
|
2019-07-26 11:00:46 +08:00 |
|
starlord
|
b0557af128
|
MS-275 Avoid sqlite logic error excetion
Former-commit-id: 88c2b25f471afd80338280d2a522de89b242051b
|
2019-07-26 10:59:16 +08:00 |
|
starlord
|
640e9141c6
|
MS-275 Avoid sqlite logic error excetion
Former-commit-id: d6ecaf2f32ed6c75370e6ed2bd24779cc18e76ff
|
2019-07-26 10:54:49 +08:00 |
|
jinhai
|
4d36b71c22
|
Merge branch 'integrate_knowhere' into 'branch-0.3.1-xiaojun'
MS-137 update knowhere version
See merge request megasearch/milvus!277
Former-commit-id: dac718d3fa12712f49ecc23b354fcb2c237002e6
|
2019-07-26 10:44:09 +08:00 |
|
xj.lin
|
aa771e7c3d
|
update knowhere version
Former-commit-id: 0457623ff251b8bb925e289df0b9bf0ee097973c
|
2019-07-26 10:42:28 +08:00 |
|
jinhai
|
29409108da
|
Merge branch 'integrate_knowhere' into 'branch-0.3.1-xiaojun'
MS-137 integrate knowhere...
See merge request megasearch/milvus!276
Former-commit-id: 642b55b3e573dcee2e686e106e7abf97a3f445ee
|
2019-07-25 20:00:19 +08:00 |
|
xj.lin
|
f37ae7765a
|
MS-137 integrate knowhere...
Former-commit-id: 04bd70d29d1da919dbff9c39e0c60ccc6db57d23
|
2019-07-25 19:57:12 +08:00 |
|
jinhai
|
2ac2dfca01
|
Fix build error and refactor code
Former-commit-id: da6bf57fdebc0fc9b03251d7d9eb6c398dd35770
|
2019-07-25 19:57:10 +08:00 |
|
kun yu
|
6aba1d011b
|
pull upstream
Former-commit-id: 82dafb79113706d919562c5aeefbf32ae010f9c3
|
2019-07-25 17:26:30 +08:00 |
|
kun yu
|
af074d0eb5
|
Merge remote-tracking branch 'upstream/branch-0.3.1' into branch-0.3.1
Former-commit-id: f3aad0f877176111021d537aa7ffcfb217041f45
|
2019-07-25 15:58:16 +08:00 |
|
jinhai
|
17fe748d30
|
MS-279 Merge from Branch-0.3.1
Former-commit-id: cd9e051d00423ae8a25f100366b1050f1604fca2
|
2019-07-24 21:28:24 +08:00 |
|