11881 Commits

Author SHA1 Message Date
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
5249b80b0d remove dummy commented code 2019-09-19 10:22:07 +08:00
peng.xu
d3e79f539e add pre run handlers 2019-09-19 10:18:46 +08:00
peng.xu
512e2b31c4 add pre run handlers 2019-09-19 10:17:00 +08:00
peng.xu
e242a1cc91 temp support dns addr 2019-09-18 20:16:46 +08:00
peng.xu
e04e00df4b add docker ignore file 2019-09-18 20:16:18 +08:00
peng.xu
cee3d7e20c remove dummy settings 2019-09-18 20:16:02 +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
peng.xu
dd59127e97 add env example 2019-09-18 18:17:51 +08:00
peng.xu
c042d2f323 add dockerfile 2019-09-18 18:16:51 +08:00
peng.xu
0ad5c32c46 update requirements.txt 2019-09-18 18:00:30 +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
jinhai
4305c8305f MS-567 - Add NOTICE.md
Former-commit-id: dba7a33adab252b6bfe853dfc1ddedf357073716
2019-09-18 17:47:18 +08:00
jinhai
b32666a407 Merge branch 'refactor_knowhere' into 'branch-0.5.0'
MS-565 Refactor knowhere

See merge request megasearch/milvus!581

Former-commit-id: 61180414e4319c25e0dcc4af5442233765c6c3ae
2019-09-18 17:40:39 +08:00
xiaojun.lin
59ea536db6 MS-565 1. del wrapper/knowhere
Former-commit-id: 3905da5c0716c6fe8317588c27a61b4a5c36316e
2019-09-18 17:36:47 +08:00
zhiru
a5b3dea158 update
Former-commit-id: 3d3617149b664de4d6af554af6e984163b963fe6
2019-09-18 17:30:05 +08:00
xiaojun.lin
ed105628fc MS-565 1. refactor dir structure 2. add license 3. del swig
Former-commit-id: 580d35b9fe3ea71ebc7d6096fbf5d905351f34f5
2019-09-18 17:27:18 +08:00
peng.xu
f22204878a fix session bug 2019-09-18 17:09:38 +08:00
peng.xu
c8f9bc5962 fix session bug 2019-09-18 17:09:03 +08:00
peng.xu
5646362157 update for models 2019-09-18 16:59:04 +08:00
peng.xu
6172258eed Merge branch 'branch-0.5.0' into 'branch-0.5.0'
add log for table file miss issue

See merge request megasearch/milvus!580

Former-commit-id: 1d1f3a598de27ffb58191394c4bce201a75e2034
2019-09-18 16:42:46 +08:00
starlord
8e5197a53b add log for table file miss issue
Former-commit-id: 641bc002a5f760e9bd804c99897d0c6c84f07919
2019-09-18 16:41:42 +08:00
jinhai
2a709fdcb8 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
Branch 0.5.0

See merge request megasearch/milvus!574

Former-commit-id: 0baa159eaada35caae20f3f1246b4a2d39527f72
2019-09-18 15:56:35 +08:00
zhiru
b364c8e3a7 update
Former-commit-id: 034185feb37416994a52ddf14a30daa06c886f14
2019-09-18 15:51:17 +08:00
zhiru
8464b8a206 refactor cmake
Former-commit-id: 587cc22f501fd12cbdaf2d9950fce3f2483c7020
2019-09-18 15:49:47 +08:00
peng.xu
099317edee add models 2019-09-18 15:43:42 +08:00