9433bf81cc
MS-554 Change license to apache 2.0
...
Former-commit-id: e09b7dd7872372fa0ece9f5d18ec4c316b89cbe8
2019-09-17 10:51:48 +08:00
b931e54458
Merge branch 'branch-0.5.0' into 'branch-0.5.0'
...
update changelog
See merge request megasearch/milvus!569
Former-commit-id: 4f355bdca1f4f9331b05b567171ac081f1d00323
2019-09-17 10:17:21 +08:00
650d43dd4e
update changelog
...
Former-commit-id: 9aefaa8682dbe383b7fdf75b4edeb6332bf36019
2019-09-17 10:16:37 +08:00
a7e8bd1a16
Merge branch 'branch-0.5.0' into 'branch-0.5.0'
...
refine cache code
See merge request megasearch/milvus!568
Former-commit-id: eedc4f8cd81868456466a027dc6c363b27f74231
2019-09-17 10:09:41 +08:00
ef37fc9702
Merge branch 'branch-0.4.0' into 'branch-0.5.0'
...
refine cache code
See merge request groot/vecwise_engine!4
Former-commit-id: 1baa0f3ce6bb90667f090e2ee76f5c168a4ca76d
2019-09-17 10:01:27 +08:00
49c3b8e9f6
refine cache code
...
Former-commit-id: 9d74c7f97e3bca9bb43963ed6f05491e258b712c
2019-09-17 09:55:25 +08:00
e25c0aa995
Merge branch 'branch-0.5.0-improve_log' into 'branch-0.5.0'
...
MS-552 Add and change the easylogging library
See merge request megasearch/milvus!567
Former-commit-id: 654becfce1696734267d5993e4773a5c914ee8b9
2019-09-17 09:54:41 +08:00
8fdef361b1
change cmakelist
...
Former-commit-id: 9a60b9fb71226b5b15e7bb2b755ff2ad53e6d922
2019-09-16 20:18:18 +08:00
d9310ff5e5
Merge branch 'branch-0.5.0' into branch-0.5.0-improve_log
...
Former-commit-id: a16dea593a6c2178ddb571a2e2bc58e636b2de0e
2019-09-16 20:09:24 +08:00
785a75a121
MS-552 Add and change the easylogging library
...
Former-commit-id: cc29d15a956a343622f1f17c63b1ada51bb172a5
2019-09-16 20:08:46 +08:00
5c36b1a052
refine cache code
...
Former-commit-id: 2a982ed5663a5e34c46d8a3be2bb5c875ee6b63a
2019-09-16 15:46:58 +08:00
18666f3b98
Merge branch 'branch-0.5.0' into 'branch-0.5.0'
...
test case level added
See merge request megasearch/milvus!566
Former-commit-id: de7ec8c621d00c5840d2174a77ce4726d7fb16f3
2019-09-16 14:20:02 +08:00
657b1f1c74
test case level added
...
Former-commit-id: e4514bfdaacae1dca00ba551d80fb9cd1cef00b8
2019-09-16 11:50:56 +08:00
56737a2f88
Update CHANGELOGS
...
Former-commit-id: 7441da96c79fb2cf89ac9ad2839ea45d3a9a5bdb
2019-09-12 18:57:06 +08:00
06433d879e
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
Update lockguard
See merge request megasearch/milvus!565
Former-commit-id: cbb039c1da725a1c8ce0c8d06150749a6157ded7
2019-09-12 17:59:32 +08:00
73ee2e0a7b
Update lockguard
...
Former-commit-id: 1bdcd84679433929e582689661730f1359077c98
2019-09-12 17:58:18 +08:00
66a3b8f420
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
Branch 0.4.0
See merge request megasearch/milvus!564
Former-commit-id: 2bcae89add594fb171fa9c5b4cce3366f4373237
2019-09-12 17:29:56 +08:00
8c9bbc4467
Fix compile error
...
Former-commit-id: 2fb38500e2c534d1ddfeca123675c2f425efb2a4
2019-09-12 09:29:09 +00:00
f6065c997f
Merge branch 'branch-1.4.0' of http://192.168.1.105:6060/jinhai/milvus into branch-0.4.0
...
Former-commit-id: 3f0e61ba1722063655c8b35870ca5e0a12e5ce9e
2019-09-12 09:24:16 +00:00
bb0bee5368
Fix boost url
...
Former-commit-id: 323f1456f38a0adb468a53b8df0599a016e19b93
2019-09-12 17:23:30 +08:00
bf9e1d7073
Merge branch 'branch-1.4.0' of http://192.168.1.105:6060/jinhai/milvus into branch-0.4.0
...
Former-commit-id: aa587bd63672ba5bec583eba3f4737142af02f0d
2019-09-12 09:13:18 +00:00
ca53a98c55
Add merge mutex
...
Former-commit-id: 3e65e9a3195ec1eff635b17997b599dbca1a0457
2019-09-12 17:11:02 +08:00
6d6bd52c24
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
fix scheduler unittest error
See merge request megasearch/milvus!563
Former-commit-id: e5048bd9d4685ca47f403b19acdd118a4442791b
2019-09-12 17:10:11 +08:00
c99afed536
Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: 6cc8ebabe500dfd9d07ddf7dad2215fca4839cbd
2019-09-12 17:07:31 +08:00
8003b709d2
fix scheduler unittest error
...
Former-commit-id: 65a76790634a63b3777aa79f038ea61f6fdf546f
2019-09-12 17:06:41 +08:00
da99a9e1f0
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
fix build index error
See merge request megasearch/milvus!562
Former-commit-id: 3f42a54ffa04c2f8c53ff6228e982fac8281b4fd
2019-09-12 16:23:44 +08:00
2175893f54
Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: d93a861e1171c298fe2d7d4cb8dd8e499b1ac3a8
2019-09-12 16:23:02 +08:00
193d0eeb6d
fix build index error
...
Former-commit-id: 593aeb2482792bfef55fbec8e6480df498cf9708
2019-09-12 16:22:21 +08:00
221a3134a1
Merge branch 'ms549' into 'branch-0.4.0'
...
MS-549 server crash when search and train on same gpu
See merge request megasearch/milvus!561
Former-commit-id: 949cd52836c801888f352fef96d7cff2022a9ca1
2019-09-12 15:48:26 +08:00
ee7fffef0c
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
MS-543 send error status to sdk when load index fail
See merge request megasearch/milvus!560
Former-commit-id: 556b4747a0a90dea0384852fa83c770b3d47563b
2019-09-12 15:44:01 +08:00
25a78bb9b1
MS-543 send error status to sdk when load index fail
...
Former-commit-id: eee5d755dc706d176a0d0a29db17ba29ebb6aa37
2019-09-12 15:42:46 +08:00
c9aff1ebab
MS-549 server crash when search and train on same gpu
...
Former-commit-id: b285b816dac478e3940a5dac38bd45c7b13da578
2019-09-12 15:33:46 +08:00
f136df4aaa
MS-543 send error status to sdk when load index fail
...
Former-commit-id: a62922b904c7f7d478f5211b4d215d387ea23ae2
2019-09-12 14:10:56 +08:00
90cd973587
Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: 824e89aeca41aebd20ad63bbe3d136126e0ba336
2019-09-12 12:50:35 +08:00
cb332598d9
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
MS-546 Add simple mode resource_config
See merge request megasearch/milvus!558
Former-commit-id: 79f3420f07aedde4897c718498cc3ec7d1be463b
2019-09-12 12:05:27 +08:00
c569f8acf5
solve conflicts
...
Former-commit-id: 9d12c13ad3b65384e6f566f83655b0d85028312f
2019-09-12 12:04:47 +08:00
5ae1a6e7f0
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
fix searchinfiles return status bug
See merge request megasearch/milvus!559
Former-commit-id: 8ed2f5d9eefdd0982de2d2aa5e10880552b25269
2019-09-12 12:03:25 +08:00
9583b9da64
Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: 3a06caa572c2732c4e9da3e5b10cd18900225fc1
2019-09-12 11:57:22 +08:00
4223ad9dc2
fix searchinfiles return status bug
...
Former-commit-id: f7d2490eb6eebf366d4130e5b48adcaab6e41020
2019-09-12 11:56:37 +08:00
0f6a6fe14d
MS-546 Add simple mode resource_config
...
Former-commit-id: 13c594c3db06dc998af041ccb85d78d92a5e8fbf
2019-09-12 11:49:32 +08:00
54ec2a126d
MS-546 Add simple mode resource_config
...
Former-commit-id: d1909071f0d5e630ae8919c473083cad04778d76
2019-09-12 11:48:45 +08:00
e54b07cf9d
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
remove knowhere path from jenkins build script
See merge request megasearch/milvus!557
Former-commit-id: e0899c91d089951d74d51056527e52fa617ea4fd
2019-09-12 11:41:19 +08:00
012d1df09f
Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: 50170cbe70ef0111ab5c81a8472e5fee5a1ec708
2019-09-12 11:39:55 +08:00
b2a20f68c0
remove knowhere path from jenkins build script
...
Former-commit-id: ce5cb318fc129a0dea7596dc2133fdc740700167
2019-09-12 11:39:16 +08:00
f08e7d612c
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
MS-532 Add grpc server unittest
See merge request megasearch/milvus!556
Former-commit-id: 15ea56174581d9a3f62edab8e9d6670e5e53180e
2019-09-12 11:37:42 +08:00
8c06e4e2e3
remove some nouse changes
...
Former-commit-id: 9b09de4cdb409f5327db7ce8966b0974eed1d3fa
2019-09-12 11:35:15 +08:00
ddfc052223
Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: 1086979d1883a172a96f99ad5d6d03aa6b61e3f1
2019-09-12 11:30:55 +08:00
6f21f6c1b2
Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: 862958802a6ea2fc33ea64cde5dbba5a7a4554bb
2019-09-12 11:30:36 +08:00
9998adb305
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
remove gpu_cache_capacity config
See merge request megasearch/milvus!555
Former-commit-id: 684259254218b9c02a3fdaa67ffadd3dca7efc0e
2019-09-12 11:30:25 +08:00
6101b08dc8
force delete lcov files
...
Former-commit-id: e7312bc87d127b0e14af239a70ef88da4a7bd9fc
2019-09-12 11:29:00 +08:00
jinhai
peng.xu
starlord
Heisenberg
zhenwu
yudong.cai
xj.lin
wxyu
Yu Kun