Commit Graph

1874 Commits

Author SHA1 Message Date
quicksilver
feda3ef849 update build.sh
Former-commit-id: f09fd1b0e764b54e1a5e8d028a12e8661b7a3151
2019-08-14 17:45:10 +08:00
quicksilver
8b7581cad8 update build.sh
Former-commit-id: 1bf5c621573c58f865e996cad2ad61b488155722
2019-08-14 17:32:52 +08:00
Jeff
9fcfe4fe58 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
for jenkins build

See merge request megasearch/milvus!352

Former-commit-id: ca0991de9f8f827d771d97cb7a815d0c6d2da59d
2019-08-14 17:14:24 +08:00
starlord
7047472cf7 for jenkins build
Former-commit-id: e69f393d71c54489917100acc18d125ded248471
2019-08-14 17:13:02 +08:00
starlord
75e1fa90e1 for jenkins build
Former-commit-id: fa78b4d2201879fd6fe2619d2b0e498c5f9bf433
2019-08-14 17:09:33 +08:00
Jeff
0aa01f7b45 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-350 remove submodule

See merge request megasearch/milvus!351

Former-commit-id: 2d49acf25c89336e35a6844c99ed0464cdeda007
2019-08-14 16:04:36 +08:00
quicksilver
ee6ac7b791 fix knowhere download directory error
Former-commit-id: 80e2e9470b01adbdaabb2f0660323aafd57c065a
2019-08-14 16:03:47 +08:00
Jeff
5771039fa0 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-350 remove submodule

See merge request megasearch/milvus!350

Former-commit-id: f3f0f9d0dbdee514a43d10c749bba0847c15005e
2019-08-14 15:59:12 +08:00
quicksilver
1246bfd89e build knowhere
Former-commit-id: e743650d98d8131ae50952f65500728c379c76bc
2019-08-14 15:58:30 +08:00
peng.xu
107fe12113 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
milvus default version 0.4.0

See merge request megasearch/milvus!349

Former-commit-id: 7d970111cd247bbb2d3fc75fc16fcd32fbe3f73f
2019-08-14 15:26:29 +08:00
starlord
a7488c2478 milvus default version 0.4.0
Former-commit-id: a62048f862cb3c36187f59c19f14b31251291156
2019-08-14 15:25:50 +08:00
Jeff
4c5c672bfc Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-350 - Remove knowhere submodule

See merge request megasearch/milvus!348

Former-commit-id: 864ec745cdd1fc2738bbddcc012e67ccef925741
2019-08-14 15:18:12 +08:00
quicksilver
c85f44e1c3 remove knowhere submodule
Former-commit-id: 694000ecfac03a507613bc1e4eb58c147a6b7413
2019-08-14 15:17:31 +08:00
Jeff
653fba6603 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-350 - Remove knowhere submodule

See merge request megasearch/milvus!347

Former-commit-id: 2cc0eaa36523d2e9b47a25c97106f8f9b4176b58
2019-08-14 15:14:11 +08:00
quicksilver
99fecf1829 update milvus_build.groovy
Former-commit-id: 396cb7ad3c48e170aaadab2bcc8813976c88bdc8
2019-08-14 15:13:21 +08:00
peng.xu
dcbc05f4e3 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
Branch 0.4.0

See merge request megasearch/milvus!346

Former-commit-id: 30362fa6fd6bb84374e802e830d7ce24d8ee4af2
2019-08-14 15:01:42 +08:00
starlord
88d4020b4f fix conflict
Former-commit-id: 307526aa00a017b74c28b9a4d123b885631dd673
2019-08-14 14:46:30 +08:00
starlord
d46d1e7f0d MS-350 remove submodule
Former-commit-id: 34c3bc3c966b666534229bed1ef03e30ad9c527b
2019-08-14 14:44:50 +08:00
starlord
d9c8e22ac5 remove knowhere submodule
Former-commit-id: 949cb32d38482a60c357e8f95a84e0a546c5e98b
2019-08-14 10:37:38 +08:00
peng.xu
2e50a88f11 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
default grpc

See merge request megasearch/milvus!344

Former-commit-id: 726e8e5f3041f11933b4c096e839065ca4627940
2019-08-14 10:18:33 +08:00
starlord
ac56710cb7 default grpc
Former-commit-id: 0e0421331684f7a44ccffa3fc24f6960d7d1114c
2019-08-14 10:14:23 +08:00
jinhai
3e4d98f04a Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-348 Add ResourceFactory Test

See merge request megasearch/milvus!343

Former-commit-id: c55c49518e73e46616d706fb9cb582dcef883d61
2019-08-13 20:29:24 +08:00
wxyu
a0c52e3730 MS-348 Add ResourceFactory Test
Former-commit-id: 2b8519881eb88c532b0a02f7f515f345545cd55c
2019-08-13 20:18:21 +08:00
peng.xu
331535c89f Merge branch 'branch-0.4.0' into 'branch-0.4.0'
clean code

See merge request megasearch/milvus!342

Former-commit-id: f68abd3aeb74d796fc4d6ac000b7e61921fce2d8
2019-08-13 18:51:35 +08:00
peng.xu
d7d41d5b58 Merge branch 'fix_MS-303' into 'branch-0.4.0'
fix MS-303

Closes MS-303

See merge request megasearch/milvus!341

Former-commit-id: 43aca5c912195fd7628ea467849bcd5fe95bd839
2019-08-13 18:51:23 +08:00
starlord
dacd86f0af clean code
Former-commit-id: 81fdba0f5bc4e523f47b4f4f7fecac1fc5abdd62
2019-08-13 18:50:36 +08:00
xj.lin
eb3f9aa6a5 fix
Former-commit-id: 7bb0559f007ef32b8331be8d4947ebe7595714b3
2019-08-13 18:49:46 +08:00
peng.xu
cb67c47874 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-346 add .cpp to solve compile error

See merge request megasearch/milvus!340

Former-commit-id: 5d6f9b817c695f04019ccc2b70122f63117e4d2e
2019-08-13 17:56:56 +08:00
wxyu
7b83d2a62f MS-346 add .cpp to solve compile error
Former-commit-id: 3db400a1bd346ca72e591fbd6b3557387f435b0c
2019-08-13 17:55:12 +08:00
jinhai
09801053e9 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-345 Add Node Test

See merge request megasearch/milvus!338

Former-commit-id: d13ce00f0b0ca8f59b01034e447c1a0419d65bc0
2019-08-13 17:52:37 +08:00
peng.xu
ae88adeee7 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
rename milvus_grpc_server to milvus_server

See merge request megasearch/milvus!339

Former-commit-id: ad8fc2817951dafcb4d54fba7f601042022185f0
2019-08-13 17:39:40 +08:00
Yu Kun
dcf8d3e838 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 5bdebcd74b5a5d7665029f727ac452807d7f564f
2019-08-13 17:29:17 +08:00
Yu Kun
bb9b6d36fd rename milvus_grpc_server to milvus_server
Former-commit-id: 54f295751d413a3af3765ff6334d25392ed17ac8
2019-08-13 17:29:13 +08:00
wxyu
46a184f1e3 Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0
Former-commit-id: 567d2b89bf0e202d39bcf81c9b1e8121dea254e4
2019-08-13 16:45:55 +08:00
wxyu
741035b408 MS-345 Add Node Test
Former-commit-id: 71877f19888587a8ede17babdd332e852f587731
2019-08-13 16:45:39 +08:00
peng.xu
8b1b54f098 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-344 Add TaskTable Test

See merge request megasearch/milvus!334

Former-commit-id: 94dfae6b58e54bca27b36af35f09ee15dd0d75ec
2019-08-13 16:42:50 +08:00
peng.xu
04d0e061ac Merge branch 'branch-0.4.0' into 'branch-0.4.0'
avoid jenkins break build

See merge request megasearch/milvus!337

Former-commit-id: afef7e472190161eec83b01811e7623a63f7ce90
2019-08-13 16:38:26 +08:00
starlord
039b38bc71 avoid jenkins break build
Former-commit-id: b326a6ae14befd2f5dad11076cc4299edc55d341
2019-08-13 16:37:22 +08:00
peng.xu
251d03ee7f Merge branch 'branch-0.4.0' into 'branch-0.4.0'
add new interface definition and move milvus_server to milvus_grpc_server

See merge request megasearch/milvus!335

Former-commit-id: a12a9f9805b81d3828699c5e69433deaa160d02d
2019-08-13 15:53:03 +08:00
Yu Kun
18f82c0676 merge upstream/branch-0.4.0
Former-commit-id: 6f30324f85ed3f86c359a96b6877affff52a75c0
2019-08-13 15:42:41 +08:00
Yu Kun
1a06e7e944 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 41b7d12779189baff1a90aaf749c4a8f138e1584
2019-08-13 15:37:27 +08:00
Yu Kun
4ba11c02d4 add new interface definition
Former-commit-id: 1f5919bfd2b3a08422c408922733e40edd9c5db2
2019-08-13 15:37:16 +08:00
wxyu
065b8d4911 MS-344 Add TaskTable Test
Former-commit-id: 9607e4bbde87ae231dfedfc8e63ea78599675aa0
2019-08-13 15:37:13 +08:00
peng.xu
e16eacc32d Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-343 Implement ResourceMgr

See merge request megasearch/milvus!333

Former-commit-id: e1e40a51bdac6faa4c085d2c347ac668c64b16fb
2019-08-13 15:34:28 +08:00
starlord
3e47b26d9f MS-343 implement ResourceMgr
Former-commit-id: f0f04297bb219cfa20e4eba609ff390f84e3a4a3
2019-08-13 15:28:27 +08:00
starlord
549b18f871 MS-343 implement ResourceMgr
Former-commit-id: 4cafc2cadf229ab61952233f1abc04d4ffdf9129
2019-08-13 15:22:01 +08:00
jinhai
9556eb21bf Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-336 scheduler interface

See merge request megasearch/milvus!332

Former-commit-id: 2545eaae1eb2f49d7d6765e4fa93c236986342af
2019-08-13 11:27:39 +08:00
wxyu
6efc7398cc MS-336 scheduler interface
Former-commit-id: 3c66c2027cfad489d7bf7cde2a6a577cd92dc8a3
2019-08-13 11:26:21 +08:00
wxyu
d551a1a3e7 MS-336 scheduler interface
Former-commit-id: 407e0af036d417a22e6002906773344fb6559818
2019-08-13 11:24:04 +08:00
jinhai
e7c202b79c Merge branch 'branch-0.3.1' into branch-0.4.0
Former-commit-id: 0158e842f89d68cb712a3a19cda55678a47256ff
2019-08-12 15:01:17 +08:00