zhiru
|
80dbaebde3
|
Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0
Former-commit-id: 73c08f0a1c4bb6913ea026c011bcb4dc9037e369
|
2019-09-18 15:11:03 +08:00 |
|
peng.xu
|
885f9ec165
|
Merge branch 'branch-0.5.0' into 'branch-0.5.0'
refine code
See merge request megasearch/milvus!577
Former-commit-id: 8a169535e70225a073bda474c657f7ca11fca90d
|
2019-09-18 15:08:14 +08:00 |
|
starlord
|
8eaf03a279
|
refine code
Former-commit-id: 710c122428d52f56a7bf41903afa4a7f8c6db01e
|
2019-09-18 15:05:51 +08:00 |
|
starlord
|
8e6cd33b5e
|
Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0
Former-commit-id: c7ad1d8c54730fcb277f7d8a20d93f88cb9d70aa
|
2019-09-18 13:56:17 +08:00 |
|
peng.xu
|
73ff79dbb8
|
Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-558 refine status code
See merge request megasearch/milvus!576
Former-commit-id: 84c716e051e4049733eb956c59507e8514ea37c0
|
2019-09-18 13:54:18 +08:00 |
|
starlord
|
cc02093029
|
Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0
Former-commit-id: 2a518240fd2f4e4fbdcb8a653f98d6520fa79315
|
2019-09-18 12:49:38 +08:00 |
|
starlord
|
69ce92dcc5
|
MS-558 refine status code
Former-commit-id: ebb5ec55a58cfce4385f39d186e86d858eab1bf0
|
2019-09-18 12:49:29 +08:00 |
|
zhiru
|
e7b8b32617
|
Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0
Former-commit-id: 5d9c7b3b3f5c91939321c7d59a481ea085f9f553
|
2019-09-18 11:29:37 +08:00 |
|
peng.xu
|
8a1001c0b8
|
Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-562 Add JobMgr and TaskCreator in Scheduler
See merge request megasearch/milvus!575
Former-commit-id: 8af2ffc75aa53bf783fe83bb1d2178b337b98144
|
2019-09-18 10:44:41 +08:00 |
|
wxyu
|
5a2743946b
|
MS-562 Add JobMgr and TaskCreator in Scheduler
Former-commit-id: bbaf2b649843e86fc7bbd28ec61e5a990fc5951f
|
2019-09-18 10:42:01 +08:00 |
|
zhiru
|
51055a29f3
|
Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0
Former-commit-id: ce5580ff84fecbcc1872ce6cf74a981af5ed98d9
|
2019-09-18 10:27:26 +08:00 |
|
peng.xu
|
91192242d9
|
Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-558 refine status code
See merge request megasearch/milvus!573
Former-commit-id: 7dd4697f35a1742e58ff5e6d265110882c2e6a8b
|
2019-09-17 17:43:07 +08:00 |
|
starlord
|
e16ac72a25
|
MS-558 refine status code
Former-commit-id: cb176cf273ec66e1f7f5e89e9ba4c39cabc511ea
|
2019-09-17 17:37:31 +08:00 |
|
zhiru
|
c5d0a6e5ae
|
Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0
Former-commit-id: 3d8b3c771fecc82184ac5051e39fb5e61353ad24
|
2019-09-17 14:14:17 +08:00 |
|
zhiru
|
49f80d3cb7
|
update main CMakeList
Former-commit-id: 68124f2a284c90ef72edc07d530e88fa67a7ed6a
|
2019-09-17 14:14:15 +08:00 |
|
peng.xu
|
dfd9ab16f6
|
Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-557 merge Log.h
See merge request megasearch/milvus!572
Former-commit-id: a525b9e9d1cc0edbe001c7350c646a2895efcb8a
|
2019-09-17 11:08:04 +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 |
|
starlord
|
b77155f3ec
|
merge Log.h
Former-commit-id: 3de21b82b857b7601075b977792ffdd36638e800
|
2019-09-17 11:05:09 +08:00 |
|
jinhai
|
70f4bf0046
|
Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-556 Add Job Definition in Scheduler
See merge request megasearch/milvus!571
Former-commit-id: 46d3c4a763e4ee6bb40c73f237ad9ed3f88ec087
|
2019-09-17 11:00:16 +08:00 |
|
wxyu
|
909e2a0934
|
add Apache License
Former-commit-id: 8afccd9400189249b2f0c797e6e0f53f74547246
|
2019-09-17 10:59:51 +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 |
|
starlord
|
63bd4cca5c
|
merge Log.h
Former-commit-id: 1204cfbfddee0b863abf10874ef97f0581c36a9a
|
2019-09-17 10:57:41 +08:00 |
|
wxyu
|
dc559ef2ca
|
solve conflicts
Former-commit-id: 42e851d305e116053bc8cbf57dffc4161e66bc48
|
2019-09-17 10:55:46 +08:00 |
|
jinhai
|
cd16ed634d
|
Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-554 Change license to apache 2.0
See merge request megasearch/milvus!570
Former-commit-id: 612f50c168b19eabc270deb1249e8c646dd9b05c
|
2019-09-17 10:55:13 +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 |
|
peng.xu
|
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 |
|
starlord
|
650d43dd4e
|
update changelog
Former-commit-id: 9aefaa8682dbe383b7fdf75b4edeb6332bf36019
|
2019-09-17 10:16:37 +08:00 |
|
peng.xu
|
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 |
|
starlord
|
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 |
|
starlord
|
49c3b8e9f6
|
refine cache code
Former-commit-id: 9d74c7f97e3bca9bb43963ed6f05491e258b712c
|
2019-09-17 09:55:25 +08:00 |
|
jinhai
|
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 |
|
Heisenberg
|
8fdef361b1
|
change cmakelist
Former-commit-id: 9a60b9fb71226b5b15e7bb2b755ff2ad53e6d922
|
2019-09-16 20:18:18 +08:00 |
|
Heisenberg
|
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 |
|
Heisenberg
|
785a75a121
|
MS-552 Add and change the easylogging library
Former-commit-id: cc29d15a956a343622f1f17c63b1ada51bb172a5
|
2019-09-16 20:08:46 +08:00 |
|
starlord
|
5c36b1a052
|
refine cache code
Former-commit-id: 2a982ed5663a5e34c46d8a3be2bb5c875ee6b63a
|
2019-09-16 15:46:58 +08:00 |
|
jinhai
|
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 |
|
zhenwu
|
657b1f1c74
|
test case level added
Former-commit-id: e4514bfdaacae1dca00ba551d80fb9cd1cef00b8
|
2019-09-16 11:50:56 +08:00 |
|
jinhai
|
56737a2f88
|
Update CHANGELOGS
Former-commit-id: 7441da96c79fb2cf89ac9ad2839ea45d3a9a5bdb
|
2019-09-12 18:57:06 +08:00 |
|
jinhai
|
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 |
|
jinhai
|
73ee2e0a7b
|
Update lockguard
Former-commit-id: 1bdcd84679433929e582689661730f1359077c98
|
2019-09-12 17:58:18 +08:00 |
|
jinhai
|
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 |
|
jinhai
|
8c9bbc4467
|
Fix compile error
Former-commit-id: 2fb38500e2c534d1ddfeca123675c2f425efb2a4
|
2019-09-12 09:29:09 +00:00 |
|
jinhai
|
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 |
|
jinhai
|
bb0bee5368
|
Fix boost url
Former-commit-id: 323f1456f38a0adb468a53b8df0599a016e19b93
|
2019-09-12 17:23:30 +08:00 |
|
jinhai
|
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 |
|
jinhai
|
ca53a98c55
|
Add merge mutex
Former-commit-id: 3e65e9a3195ec1eff635b17997b599dbca1a0457
|
2019-09-12 17:11:02 +08:00 |
|
peng.xu
|
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 |
|
starlord
|
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 |
|