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
|
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 |
|
xiaojun.lin
|
02270a6298
|
MS-568 Fix GpuResource free error
Former-commit-id: 52acd35e93a5293c70c45bb681fc54046b43a2cb
|
2019-09-19 14:52:14 +08:00 |
|
yudong.cai
|
4d23ecf082
|
MS-572 re-org signal handle
Former-commit-id: a357dd78d214c3f2c39538ea32f7fc492d72b6f2
|
2019-09-19 14:16:43 +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 |
|
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
|
8382fa623c
|
MS-570 - Add prometheus docker-compose file
Former-commit-id: 1b60196354afab6e8fd3355d0752d66cf9722702
|
2019-09-18 20:03:01 +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
|
4305c8305f
|
MS-567 - Add NOTICE.md
Former-commit-id: dba7a33adab252b6bfe853dfc1ddedf357073716
|
2019-09-18 17:47:18 +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
|
8464b8a206
|
refactor cmake
Former-commit-id: 587cc22f501fd12cbdaf2d9950fce3f2483c7020
|
2019-09-18 15:49:47 +08:00 |
|
wxyu
|
5a2743946b
|
MS-562 Add JobMgr and TaskCreator in Scheduler
Former-commit-id: bbaf2b649843e86fc7bbd28ec61e5a990fc5951f
|
2019-09-18 10:42:01 +08:00 |
|
jielin.xu
|
edd566b046
|
Update CHANGELOG.md
Former-commit-id: d822441834b09e510ed386ee64f436ac6c15e6af
|
2019-09-17 18:53:43 +08:00 |
|
jielin.xu
|
a5ad6a19ed
|
Update CHANGELOG.md
Former-commit-id: df346c406bdecbf100761b5aa3de710ba8325a46
|
2019-09-17 18:49:58 +08:00 |
|
starlord
|
e16ac72a25
|
MS-558 refine status code
Former-commit-id: cb176cf273ec66e1f7f5e89e9ba4c39cabc511ea
|
2019-09-17 17:37:31 +08:00 |
|
starlord
|
5f07962cd4
|
MS-557 merge Log.h
Former-commit-id: 37a1aece83b0885aef1ad60fbd3b26805df57a54
|
2019-09-17 11:07:39 +08:00 |
|
starlord
|
9d53224b6a
|
MS-557 merge Log.h
Former-commit-id: 0fb5985bc71132307d66eea85c098d3518935c8c
|
2019-09-17 11:06:26 +08:00 |
|
wxyu
|
6cbf62c35f
|
Merge remote-tracking branch 'main/branch-0.5.0' into branch-0.5.0
Former-commit-id: 3b0b477ac496700e63f0ecf51fed63d100f2bd24
|
2019-09-17 10:58:01 +08:00 |
|
wxyu
|
dc559ef2ca
|
solve conflicts
Former-commit-id: 42e851d305e116053bc8cbf57dffc4161e66bc48
|
2019-09-17 10:55:46 +08:00 |
|
wxyu
|
af9c167ed0
|
MS-556 Add Job Definition in Scheduler
Former-commit-id: 87787757226f3b397d65125a687442222a5d3532
|
2019-09-17 10:54:51 +08:00 |
|
jinhai
|
9433bf81cc
|
MS-554 Change license to apache 2.0
Former-commit-id: e09b7dd7872372fa0ece9f5d18ec4c316b89cbe8
|
2019-09-17 10:51:48 +08:00 |
|
starlord
|
650d43dd4e
|
update changelog
Former-commit-id: 9aefaa8682dbe383b7fdf75b4edeb6332bf36019
|
2019-09-17 10:16:37 +08:00 |
|
Heisenberg
|
785a75a121
|
MS-552 Add and change the easylogging library
Former-commit-id: cc29d15a956a343622f1f17c63b1ada51bb172a5
|
2019-09-16 20:08:46 +08:00 |
|
jinhai
|
56737a2f88
|
Update CHANGELOGS
Former-commit-id: 7441da96c79fb2cf89ac9ad2839ea45d3a9a5bdb
|
2019-09-12 18:57:06 +08:00 |
|
yudong.cai
|
f136df4aaa
|
MS-543 send error status to sdk when load index fail
Former-commit-id: a62922b904c7f7d478f5211b4d215d387ea23ae2
|
2019-09-12 14:10:56 +08:00 |
|
wxyu
|
c569f8acf5
|
solve conflicts
Former-commit-id: 9d12c13ad3b65384e6f566f83655b0d85028312f
|
2019-09-12 12:04:47 +08:00 |
|
wxyu
|
54ec2a126d
|
MS-546 Add simple mode resource_config
Former-commit-id: d1909071f0d5e630ae8919c473083cad04778d76
|
2019-09-12 11:48:45 +08:00 |
|
Yu Kun
|
c98c46d3f0
|
Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: a5c66e27fb41eff47fe0725fd14029a983f3ab62
|
2019-09-10 21:00:03 +08:00 |
|
wxyu
|
93297ffe5d
|
Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0
Former-commit-id: c2a42f8e0cd12ca351c024638c41d56e4f0f22b3
|
2019-09-10 19:31:45 +08:00 |
|
wxyu
|
ded3355538
|
MS-539 Remove old task code
Former-commit-id: 89d66627b558cb33e5b482520e256b701e5d7868
|
2019-09-10 19:31:29 +08:00 |
|
Heisenberg
|
911dac8ee9
|
changelog stuff
Former-commit-id: f39decca3d75405da88a58ec958a315e9b69b668
|
2019-09-10 18:47:02 +08:00 |
|
Heisenberg
|
4e28185484
|
merge the newest code
Former-commit-id: 69be61b7715976b4852881717743e2dc121fbf49
|
2019-09-10 18:40:34 +08:00 |
|
yudong.cai
|
65d20ae3d8
|
MS-507 fix performance issue when set CPU_CACHE to 16 or 64
Former-commit-id: 402b5d91a9866c38bc7dd16be1fa22de5a0b6bf8
|
2019-09-10 18:35:32 +08:00 |
|
Heisenberg
|
63d7157d52
|
MS-121 The problem that user can't change the time zone
Former-commit-id: f9d90003427694ecc72c2eb1dd1a9f52320a9f26
|
2019-09-10 18:26:39 +08:00 |
|
Yu Kun
|
4f55c80376
|
fix conflicts
Former-commit-id: f7a27268673c3544a75eee494e7c612c76c38384
|
2019-09-10 14:25:02 +08:00 |
|
zhiru
|
72f3bb6414
|
Config file validation
Former-commit-id: 1fc9b78d356da8ee05df4e9aa9189604daaf1670
|
2019-09-09 20:53:47 +08:00 |
|
zhiru
|
9f739a9399
|
Config file validation
Former-commit-id: a49c32a0b5a9736e0151a5054cd9a10fd8828bae
|
2019-09-09 20:52:11 +08:00 |
|
Heisenberg
|
d94945a999
|
Merge branch 'branch-0.4.0' into MS-119_log_file_question
Former-commit-id: 765c98b91bf45617613568feed360b8dbc3ecc47
|
2019-09-09 20:28:33 +08:00 |
|
Yu Kun
|
2626f70198
|
MS-532 Add grpc server unittest
Former-commit-id: 41f4497aeb0572f43c320e473d8640a655fcbae2
|
2019-09-09 20:17:01 +08:00 |
|
wxyu
|
002fd9fdea
|
MS-533 Update resource_test to cover dump function
Former-commit-id: 01e59ea5d95d3ea72a9ec0f7ed2caaaf62e21279
|
2019-09-09 20:16:34 +08:00 |
|
Yu Kun
|
c010422124
|
MS-532 Add grpc server unittest
Former-commit-id: d2c68090955ef147480de31c9022dcb2dc928e40
|
2019-09-09 20:15:43 +08:00 |
|
wxyu
|
57eabe260f
|
MS-531 Disable next version code
Former-commit-id: d4148022dd1c10a8c9da0c2119e359cc37e4f53f
|
2019-09-09 19:35:32 +08:00 |
|
Heisenberg
|
a823d6e4bf
|
fix the changelog merge conflict
Former-commit-id: e3032f4d47c793365de5bce0f49d790c7b3c82ba
|
2019-09-09 19:17:50 +08:00 |
|
Heisenberg
|
a641bb4bb3
|
MS-119 The problem of combining the log files
Former-commit-id: b3ade33ab3348ef3108c60faa62e8e3239ad5a00
|
2019-09-09 19:15:27 +08:00 |
|
wxyu
|
2af41317e6
|
MS-530 Add unittest for SearchTask->Load
Former-commit-id: dff97021943c200ca003d766af221c008e5f0ac2
|
2019-09-09 19:13:30 +08:00 |
|