1903 Commits

Author SHA1 Message Date
quicksilver
0f287c3910 format CMakeLists.txt
Former-commit-id: b1980e2e8fda99a49d9bd005ce0caf0ef494ca02
2019-09-25 16:32:48 +08:00
quicksilver
41a2cc3432 format CMakeLists.txt
Former-commit-id: 281e0bcb78233f6570c426fab6f9a4a067adf790
2019-09-25 15:17:06 +08:00
quicksilver
34a5e23f36 Merge branch 'branch-0.5.0' of http://192.168.1.105:6060/megasearch/milvus into branch-0.5.0
Former-commit-id: 2e80e61b46c0f3b926eee5676ab38f77514a26f1
2019-09-25 15:04:49 +08:00
quicksilver
5c4889dd25 format CMakeLists.txt
Former-commit-id: 447d58d1b8d0a065f2c5c5ec7b7aa3b57babe8b3
2019-09-25 15:04:42 +08:00
starlord
be2abf935c fix build error
Former-commit-id: f094a9ad816accc2b6fc96e2c515e554d9ce8f14
2019-09-25 14:15:26 +08:00
Yu Kun
4a1b0fa261 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0
Former-commit-id: 7713ece20e698cee8e07229f9fb9fc869bb066c4
2019-09-25 11:55:31 +08:00
starlord
f195bd7d33 remove unused option
Former-commit-id: 2594078698d7e570d40f0e72a8f868e1d5a0bd2d
2019-09-25 11:42:25 +08:00
starlord
3cbc8b6825 MS-586 Remove BUILD_FAISS_WITH_MKL option
Former-commit-id: 22f4383828bc1e975c7b21e8ee6a64936039e41b
2019-09-25 10:50:33 +08:00
Yu Kun
a0cca6ebe7 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0
Former-commit-id: 0c2a2277095e14a4216a16f214f98408064fdb4d
2019-09-21 19:16:24 +08:00
Yu Kun
d470889d4e MS-582 grafana displays changes frequently
Former-commit-id: 9e2771a4ea84cf8b868628ce64cf0b0ad48a200d
2019-09-21 19:16:15 +08:00
wxyu
d64389c7e3 MS-585 Update namespace in scheduler
Former-commit-id: 073ab3c91a97415efcb7d3be516a6bc00ee07a7a
2019-09-21 11:29:04 +08:00
starlord
1b4ce04c08 refine code
Former-commit-id: 8e2af64ed8fe7517069944eed3545d13398a3ed7
2019-09-20 19:29:06 +08:00
jinhai
15a1c186f7 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-576 Scheduler refactor

See merge request megasearch/milvus!601

Former-commit-id: e9e3d4e87aedf2a959845fdb67d52f1fe2c1ffc6
2019-09-20 18:26:33 +08:00
Yu Kun
cfc42c5471 MS-576 Scheduler refactor
Former-commit-id: dc9317412c5dc72191381d5a634e7e9ff14f98b2
2019-09-20 18:02:08 +08:00
starlord
c13edb909e MS-578 makesure milvus5.0 dont crack 0.3.1 data
Former-commit-id: e3c81573e4a28ac51b564db548dd29fee92e1915
2019-09-20 17:35:31 +08:00
test
48e296ca8c Merge branch 'branch-0.5.0' of http://192.168.1.105:6060/megasearch/milvus into branch-0.5.0
Former-commit-id: dc9986a7dd5d09aabf5bc16f4840a2cac4538848
2019-09-20 09:14:38 +00:00
test
5806f1dd5c MS-575 Add Clang-format & Clang-tidy & Cpplint
Former-commit-id: 9e0fe09aaa5f30b7fcdafa66415b9b35921954c9
2019-09-20 09:14:20 +00:00
jinhai
a9c5b7b386 Merge branch 'Refactor_Knowhere' into 'branch-0.5.0'
MS-583 Change to Status from errorcode

See merge request megasearch/milvus!599

Former-commit-id: 7173cb0bcb9e6669c124e75696b5c271da94b036
2019-09-20 17:07:43 +08:00
jinhai
481f1e543a Merge branch 'branch-0.5.0' into 'branch-0.5.0'
Branch 0.5.0

See merge request megasearch/milvus!598

Former-commit-id: eb4d708b112a23923100536e3c71c4fcef3802eb
2019-09-20 17:07:31 +08:00
test
62b993295e MS-575 Add Clang-format & Clang-tidy & Cpplint
Former-commit-id: 0e94a8add6753a158ce59912826a553a32fa8566
2019-09-20 09:00:15 +00:00
test
40f441ddd6 Merge branch 'branch-0.5.0' of http://192.168.1.105:6060/megasearch/milvus into branch-0.5.0
Former-commit-id: 8caea68514c6eed0fc8fc7ecd13f7778d1185977
2019-09-20 08:59:12 +00:00
test
4c944e1b72 MS-575 Add Clang-format & Clang-tidy & Cpplint
Former-commit-id: f72da7918b3696f906d0f3a2ef8590b6bd16d3d2
2019-09-20 08:59:05 +00:00
Heisenberg
72ffa6c4fd MS-583 Change to Status from errorcode
Former-commit-id: 63ba084d42e2fba75a581895cb3513666bff4329
2019-09-20 16:10:29 +08:00
Jeff
26e06cdcf4 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
fix typo

See merge request megasearch/milvus!597

Former-commit-id: b7b5d95fa1d0a9e93c0bd24d4ee720cb6ab8a8f3
2019-09-20 15:41:10 +08:00
jielin.xu
36fd87481b Update CONTRIBUTING.md
Former-commit-id: bb1f9f679c416bfd203960c8cb4e0052a977a6d8
2019-09-20 15:40:52 +08:00
starlord
94b5ec4919 fix typo
Former-commit-id: a35553692abacc8cbb1f94f5924871a1202f3e08
2019-09-20 15:40:10 +08:00
jielin.xu
e364d7fa11 Update CONTRIBUTING.md
Former-commit-id: 9c22848294d0e339b76d38637b2d0494842cc4b7
2019-09-20 15:33:42 +08:00
test
7f12117031 Merge branch 'branch-0.5.0' of http://192.168.1.105:6060/megasearch/milvus into branch-0.5.0
Former-commit-id: d978a598f209139e8d3936a60eb34ae2fa3b4d42
2019-09-20 06:57:40 +00:00
test
0ff59df1a4 MS-575 Add Clang-format & Clang-tidy & Cpplint
Former-commit-id: e62b3b42b0b27c3bbbb6d62cfff4a518913298d7
2019-09-20 06:57:23 +00:00
starlord
24b8e393bf merge code
Former-commit-id: 213b4823192af7e340ac5a250c363d0a32a3c3aa
2019-09-20 11:53:04 +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
starlord
7e58704662 fix unittest hang issue
Former-commit-id: 1e6b431332c823fbbef29132eaaaaff86b8afe7e
2019-09-19 18:44:20 +08:00
starlord
44c382da83 refine code
Former-commit-id: 673cf5d86bf86f50cfdfa3576c3dbd20204487b9
2019-09-19 18:13:48 +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
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
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
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