Commit Graph

2732 Commits (c181e405e49a65b2990bd0155bc1ee11a6ff47ae)

Author SHA1 Message Date
jinhai 16a9b336ed Merge branch 'refactor_knowhere' into 'branch-0.5.0'
MS-595 Refactor knowhere

See merge request megasearch/milvus!595

Former-commit-id: 69c0925a8321cc8381e6250aedb12b5718fe9a27
2019-09-20 11:49:49 +08:00
starlord 8e17f4826d modify readme
Former-commit-id: 4a5f9bd6666d283a5fe8f22a713fe0e587f5f6ad
2019-09-20 11:44:52 +08:00
starlord 736ca8e473 MS-578 makesure milvus5.0 dont crack 0.3.1 data
Former-commit-id: 9f801246821d98c4f5d7681252b5dfadf1f94773
2019-09-20 11:33:10 +08:00
jielin.xu fc6bf8fcd1 Update CONTRIBUTING.md
Former-commit-id: 29edebcd376afba24e5c62695d7260e30acb8336
2019-09-20 11:14:44 +08:00
xiaojun.lin 4b91faa50c MS-565 split class version 1
Former-commit-id: 1a60045de13e055d4b0a7e9da389b7e377c141af
2019-09-19 21:21:38 +08:00
xiaojun.lin 8776ea6e8d Merge branch 'branch-0.5.0' into refactor_knowhere
Former-commit-id: 1b4cc493702639b7e3e2f0f2e504ac34b951430e
2019-09-19 19:09:54 +08:00
xiaojun.lin b282580bf9 MS-565 rename knowhere files
Former-commit-id: a7c2a8b1d99e6cf29bbcaf27b131e0ce5bd42f43
2019-09-19 19:01:26 +08:00
peng.xu 7a18293865 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
fix unittest hang issue

See merge request megasearch/milvus!594

Former-commit-id: a62add9b2b7a16a0f03192a7886e759b4b366a32
2019-09-19 18:45:06 +08:00
starlord 7e58704662 fix unittest hang issue
Former-commit-id: 1e6b431332c823fbbef29132eaaaaff86b8afe7e
2019-09-19 18:44:20 +08:00
peng.xu f4a9eab6cf Merge branch 'branch-0.5.0' into 'branch-0.5.0'
Branch 0.5.0

See merge request megasearch/milvus!593

Former-commit-id: 816c8478abe931599572e54738192265df75092b
2019-09-19 18:15:39 +08:00
starlord 44c382da83 refine code
Former-commit-id: 673cf5d86bf86f50cfdfa3576c3dbd20204487b9
2019-09-19 18:13:48 +08:00
starlord 88304138b0 Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0
Former-commit-id: 036da4f101080d5c1f692c485d23ab6d12daa0f5
2019-09-19 18:04:30 +08:00
jinhai e751b423d6 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-577 Unittest Query randomly hung

See merge request megasearch/milvus!592

Former-commit-id: 6457d9e8d41adba338c728635b75cfef6492fe7b
2019-09-19 17:29:46 +08:00
wxyu f92f6e54a8 solve conflicts
Former-commit-id: 965755d0955c2ec2f27835802b356a188ee27e10
2019-09-19 17:28:53 +08:00
wxyu 75ea4c4add MS-577 Unittest Query randomly hung
Former-commit-id: 5e4365deea822861077f41cda17d3cbd8504f327
2019-09-19 17:28:15 +08:00
starlord 9ce6a32f51 Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0
Former-commit-id: da73035804cac289129cb02dd6eb8f7458bb9b87
2019-09-19 16:33:34 +08:00
test c72d8ac14b MS-575 Add Clang-format & Clang-tidy & Cpplint
Former-commit-id: 226d8cc0deeb9062227da6f36d3d684d80ca4d18
2019-09-19 08:25:12 +00:00
jinhai be95219e49 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
fix unitest failed issue

See merge request megasearch/milvus!590

Former-commit-id: c1dbdd8c0e06f07bba7a3f64e235465de20696ed
2019-09-19 15:22:25 +08:00
jinhai 4e8b762329 Merge branch 'Refactor_Knowhere' into 'branch-0.5.0'
MS-573 Enable log in knowhere

See merge request megasearch/milvus!589

Former-commit-id: 41baf80533e98d5f30898e3e2956351d764ff7a2
2019-09-19 15:20:00 +08:00
Heisenberg e26948e858 MS-573 remove useless code
Former-commit-id: 4db9733a33dcbc26b5b11a66f54087d3af51ccc6
2019-09-19 15:18:37 +08:00
starlord 42cd126b9a Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0
Former-commit-id: d712f79f04a04592c41365d9b360d7f0b866a302
2019-09-19 15:15:42 +08:00
starlord 6ed8251c3b fix unitest failed issue
Former-commit-id: b4f12f185be2a302c25fa04695966f49c2a446ed
2019-09-19 15:15:35 +08:00
Heisenberg 029d4a97b3 MS-573 Enable log in knowhere
Former-commit-id: 7b60e5fc6edcaabea9e967ba4f3312a17533c986
2019-09-19 15:12:46 +08:00
jinhai adfa2cacf4 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
Branch 0.5.0

See merge request megasearch/milvus!588

Former-commit-id: eced8ff211797dcb4b914c2db5b92db2670e3249
2019-09-19 15:03:47 +08:00
yudong.cai b6c0c04463 Merge remote-tracking branch 'main/branch-0.5.0' into branch-0.5.0
Former-commit-id: 05c0b1d4edfd0f2f87a4c24efad984c7a1c5c38f
2019-09-19 15:01:09 +08:00
jinhai 44167aec26 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
Update README.md

See merge request megasearch/milvus!586

Former-commit-id: 4a96e482592233ce11cf765e7a1466b06dded9b1
2019-09-19 14:58:06 +08:00
jinhai 878ad7be50 Merge branch 'ms-568' into 'branch-0.5.0'
MS-568 Fix GpuResource free error

See merge request megasearch/milvus!587

Former-commit-id: b8d4623c617016c6569e90a6f5cb1fd2510ab371
2019-09-19 14:57:24 +08:00
yudong.cai dc71feabab use better name
Former-commit-id: ccf466b6906067d03cb62f0a813a3d7b4c346e2c
2019-09-19 14:52:25 +08:00
xiaojun.lin 02270a6298 MS-568 Fix GpuResource free error
Former-commit-id: 52acd35e93a5293c70c45bb681fc54046b43a2cb
2019-09-19 14:52:14 +08:00
yudong.cai 19d7c065ac MS-572 correct format
Former-commit-id: 0bdbc27634eed7ba241b40d5957f5689d50d6a6a
2019-09-19 14:46:09 +08:00
yudong.cai 4d23ecf082 MS-572 re-org signal handle
Former-commit-id: a357dd78d214c3f2c39538ea32f7fc492d72b6f2
2019-09-19 14:16:43 +08:00
yudong.cai c89a99b800 MS-572 fix Milvus crash when get SIGINT
Former-commit-id: 32b92068024731fcc3451271c7f66f8a37b68cbd
2019-09-19 14:16:43 +08:00
jielin.xu 4b6be7b0c0 Update README.md
Former-commit-id: aeac98a8cdc3cf186ee9c3e8916ca646345e6218
2019-09-19 14:10:22 +08:00
jinhai 613b0170ab Merge branch 'branch-0.5.0' into 'branch-0.5.0'
fix cmake

See merge request megasearch/milvus!585

Former-commit-id: 5081eef5bcbde453109475b2c6ec345c472abe6a
2019-09-19 14:04:04 +08:00
jinhai c9e56eacc9 Merge branch 'change_notice' into 'branch-0.5.0'
MS-569 Complete the NOTICE.md

See merge request megasearch/milvus!583

Former-commit-id: 5bb906c495280e85f62da32f38ff2019acc76a02
2019-09-19 14:01:41 +08:00
zhiru 5c16730469 fix cmake
Former-commit-id: dd8288d065c48eccc6dff699d153e48fbe5205f4
2019-09-19 12:52:46 +08:00
Heisenberg ad1fe081f0 Merge branch 'branch-0.5.0' into Refactor_Knowhere
Former-commit-id: a57472c60518d5fe322469561bd71304192df9f9
2019-09-19 11:05:37 +08:00
Heisenberg 3978c2a71f add Log.h in knowhere
Former-commit-id: e866a09e487f1ef60816bd0ee6c7308e4bf1ff7e
2019-09-19 11:04:56 +08:00
peng.xu e06ccd6bca Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-570 - Add prometheus docker-compose file

See merge request megasearch/milvus!584

Former-commit-id: 5f0022053eec9acf50d6479fa78801d43c6f7454
2019-09-18 20:11:41 +08:00
Yu Kun 00b815332e Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0
Former-commit-id: 672874bd9e304dc7a82ae652c6b68bd861e2a781
2019-09-18 20:04:07 +08:00
Yu Kun 1a3231e6f6 MS-570 - Add prometheus docker-compose file
Former-commit-id: a81bcfd940892284d9f0c26049e4c42c0cf80f34
2019-09-18 20:03:19 +08:00
Yu Kun 8382fa623c MS-570 - Add prometheus docker-compose file
Former-commit-id: 1b60196354afab6e8fd3355d0752d66cf9722702
2019-09-18 20:03:01 +08:00
jinhai be9b9ff5d1 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-555 Remove old scheduler

See merge request megasearch/milvus!582

Former-commit-id: 7fe9cc22b6e2fa2ce83ce30f8952afb995e5af0e
2019-09-18 19:54:33 +08:00
Heisenberg 5c63047eb3 Merge branch 'branch-0.5.0' into change_notice
Former-commit-id: a669b94a9b428a8202d715a37b3ad82c22f99907
2019-09-18 19:53:38 +08:00
Heisenberg e8224fc61d MS-569 Complete the NOTICE.md
Former-commit-id: dd04582d0ac67e31fdb503a70647cdd3eadebd4a
2019-09-18 19:53:08 +08:00
wxyu 3c6f49f9cc MS-555 Remove old scheduler
Former-commit-id: e07f211e59232b04cfa3f37240e896461ad9b616
2019-09-18 19:52:23 +08:00
wxyu e72b0348f7 MS-555 Remove old scheduler
Former-commit-id: 8eb7f773a15df78f46bf61a59ec0ea9d8923cc28
2019-09-18 19:44:38 +08:00
jinhai aec552789c Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-566: Refactor cmake

See merge request megasearch/milvus!578

Former-commit-id: 17ab315d0176908e548b31e33801ceb78b0ca05e
2019-09-18 19:02:33 +08:00
zhiru 666c6003f4 update
Former-commit-id: 1a3242b1ac87cad3274cc28d2e73697e55936e8b
2019-09-18 19:00:40 +08:00
jinhai 0fb840b91c Merge branch 'branch-0.5.0' of http://192.168.1.105:6060/megasearch/milvus into branch-0.5.0
Former-commit-id: 9efc38e4e13c7c10ace0b00c602a3c1bad63707c
2019-09-18 17:47:30 +08:00