提交 · b931e54458ec63fdcd432d1336fd9e3a1f05608f · BaiXuePrincess / milvus

17 9月, 2019 6 次提交

Merge branch 'branch-0.5.0' into 'branch-0.5.0' · b931e544

由 peng.xu 提交于 9月 17, 2019

update changelog

See merge request megasearch/milvus!569

Former-commit-id: 4f355bdca1f4f9331b05b567171ac081f1d00323

b931e544

S
update changelog · 650d43dd
由 starlord 提交于 9月 17, 2019
```
Former-commit-id: 9aefaa8682dbe383b7fdf75b4edeb6332bf36019
```
650d43dd

Merge branch 'branch-0.5.0' into 'branch-0.5.0' · a7e8bd1a

由 peng.xu 提交于 9月 17, 2019

refine cache code

See merge request megasearch/milvus!568

Former-commit-id: eedc4f8cd81868456466a027dc6c363b27f74231

a7e8bd1a

Merge branch 'branch-0.4.0' into 'branch-0.5.0' · ef37fc97

由 starlord 提交于 9月 17, 2019

refine cache code

See merge request groot/vecwise_engine!4

Former-commit-id: 1baa0f3ce6bb90667f090e2ee76f5c168a4ca76d

ef37fc97

S
refine cache code · 49c3b8e9
由 starlord 提交于 9月 17, 2019
```
Former-commit-id: 9d74c7f97e3bca9bb43963ed6f05491e258b712c
```
49c3b8e9

Merge branch 'branch-0.5.0-improve_log' into 'branch-0.5.0' · e25c0aa9

由 jinhai 提交于 9月 17, 2019

MS-552 Add and change the easylogging library

See merge request megasearch/milvus!567

Former-commit-id: 654becfce1696734267d5993e4773a5c914ee8b9

e25c0aa9

16 9月, 2019 6 次提交
- H
  change cmakelist · 8fdef361
  由 Heisenberg 提交于 9月 16, 2019
```
Former-commit-id: 9a60b9fb71226b5b15e7bb2b755ff2ad53e6d922
```
  8fdef361
- H
  Merge branch 'branch-0.5.0' into branch-0.5.0-improve_log · d9310ff5
  由 Heisenberg 提交于 9月 16, 2019
```
Former-commit-id: a16dea593a6c2178ddb571a2e2bc58e636b2de0e
```
  d9310ff5
- H
  MS-552 Add and change the easylogging library · 785a75a1
  由 Heisenberg 提交于 9月 16, 2019
```
Former-commit-id: cc29d15a956a343622f1f17c63b1ada51bb172a5
```
  785a75a1
- S
  refine cache code · 5c36b1a0
  由 starlord 提交于 9月 16, 2019
```
Former-commit-id: 2a982ed5663a5e34c46d8a3be2bb5c875ee6b63a
```
  5c36b1a0
- J
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · 18666f3b
  由 jinhai 提交于 9月 16, 2019
```
test case level added

See merge request megasearch/milvus!566

Former-commit-id: de7ec8c621d00c5840d2174a77ce4726d7fb16f3
```
  18666f3b
- Z
  test case level added · 657b1f1c
  由 zhenwu 提交于 9月 16, 2019
```
Former-commit-id: e4514bfdaacae1dca00ba551d80fb9cd1cef00b8
```
  657b1f1c
12 9月, 2019 28 次提交
- J
  Update CHANGELOGS · 56737a2f
  由 jinhai 提交于 9月 12, 2019
```
Former-commit-id: 7441da96c79fb2cf89ac9ad2839ea45d3a9a5bdb
```
  56737a2f
- J
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 06433d87
  由 jinhai 提交于 9月 12, 2019
```
Update lockguard

See merge request megasearch/milvus!565

Former-commit-id: cbb039c1da725a1c8ce0c8d06150749a6157ded7
```
  06433d87
- J
  Update lockguard · 73ee2e0a
  由 jinhai 提交于 9月 12, 2019
```
Former-commit-id: 1bdcd84679433929e582689661730f1359077c98
```
  73ee2e0a
- J
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 66a3b8f4
  由 jinhai 提交于 9月 12, 2019
```
Branch 0.4.0

See merge request megasearch/milvus!564

Former-commit-id: 2bcae89add594fb171fa9c5b4cce3366f4373237
```
  66a3b8f4
- J
  Fix compile error · 8c9bbc44
  由 jinhai 提交于 9月 12, 2019
```
Former-commit-id: 2fb38500e2c534d1ddfeca123675c2f425efb2a4
```
  8c9bbc44
- J
  Merge branch 'branch-1.4.0' of http://192.168.1.105:6060/jinhai/milvus into branch-0.4.0 · f6065c99
  由 jinhai 提交于 9月 12, 2019
```
Former-commit-id: 3f0e61ba1722063655c8b35870ca5e0a12e5ce9e
```
  f6065c99
- J
  Fix boost url · bb0bee53
  由 jinhai 提交于 9月 12, 2019
```
Former-commit-id: 323f1456f38a0adb468a53b8df0599a016e19b93
```
  bb0bee53
- J
  Merge branch 'branch-1.4.0' of http://192.168.1.105:6060/jinhai/milvus into branch-0.4.0 · bf9e1d70
  由 jinhai 提交于 9月 12, 2019
```
Former-commit-id: aa587bd63672ba5bec583eba3f4737142af02f0d
```
  bf9e1d70
- J
  Add merge mutex · ca53a98c
  由 jinhai 提交于 9月 12, 2019
```
Former-commit-id: 3e65e9a3195ec1eff635b17997b599dbca1a0457
```
  ca53a98c
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 6d6bd52c
  由 peng.xu 提交于 9月 12, 2019
```
fix scheduler unittest error

See merge request megasearch/milvus!563

Former-commit-id: e5048bd9d4685ca47f403b19acdd118a4442791b
```
  6d6bd52c
- S
  Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0 · c99afed5
  由 starlord 提交于 9月 12, 2019
```
Former-commit-id: 6cc8ebabe500dfd9d07ddf7dad2215fca4839cbd
```
  c99afed5
- S
  fix scheduler unittest error · 8003b709
  由 starlord 提交于 9月 12, 2019
```
Former-commit-id: 65a76790634a63b3777aa79f038ea61f6fdf546f
```
  8003b709
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · da99a9e1
  由 peng.xu 提交于 9月 12, 2019
```
fix build index error

See merge request megasearch/milvus!562

Former-commit-id: 3f42a54ffa04c2f8c53ff6228e982fac8281b4fd
```
  da99a9e1
- S
  Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0 · 2175893f
  由 starlord 提交于 9月 12, 2019
```
Former-commit-id: d93a861e1171c298fe2d7d4cb8dd8e499b1ac3a8
```
  2175893f
- S
  fix build index error · 193d0eeb
  由 starlord 提交于 9月 12, 2019
```
Former-commit-id: 593aeb2482792bfef55fbec8e6480df498cf9708
```
  193d0eeb
- J
  Merge branch 'ms549' into 'branch-0.4.0' · 221a3134
  由 jinhai 提交于 9月 12, 2019
```
MS-549 server crash when search and train on same gpu

See merge request megasearch/milvus!561

Former-commit-id: 949cd52836c801888f352fef96d7cff2022a9ca1
```
  221a3134
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · ee7fffef
  由 peng.xu 提交于 9月 12, 2019
```
MS-543 send error status to sdk when load index fail

See merge request megasearch/milvus!560

Former-commit-id: 556b4747a0a90dea0384852fa83c770b3d47563b
```
  ee7fffef
- Y
  MS-543 send error status to sdk when load index fail · 25a78bb9
  由 yudong.cai 提交于 9月 12, 2019
```
Former-commit-id: eee5d755dc706d176a0d0a29db17ba29ebb6aa37
```
  25a78bb9
- X
  MS-549 server crash when search and train on same gpu · c9aff1eb
  由 xj.lin 提交于 9月 12, 2019
```
Former-commit-id: b285b816dac478e3940a5dac38bd45c7b13da578
```
  c9aff1eb
- Y
  MS-543 send error status to sdk when load index fail · f136df4a
  由 yudong.cai 提交于 9月 12, 2019
```
Former-commit-id: a62922b904c7f7d478f5211b4d215d387ea23ae2
```
  f136df4a
- Y
  Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0 · 90cd9735
  由 yudong.cai 提交于 9月 12, 2019
```
Former-commit-id: 824e89aeca41aebd20ad63bbe3d136126e0ba336
```
  90cd9735
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · cb332598
  由 peng.xu 提交于 9月 12, 2019
```
MS-546 Add simple mode resource_config

See merge request megasearch/milvus!558

Former-commit-id: 79f3420f07aedde4897c718498cc3ec7d1be463b
```
  cb332598
- W
  solve conflicts · c569f8ac
  由 wxyu 提交于 9月 12, 2019
```
Former-commit-id: 9d12c13ad3b65384e6f566f83655b0d85028312f
```
  c569f8ac
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 5ae1a6e7
  由 peng.xu 提交于 9月 12, 2019
```
fix searchinfiles return status bug

See merge request megasearch/milvus!559

Former-commit-id: 8ed2f5d9eefdd0982de2d2aa5e10880552b25269
```
  5ae1a6e7
- Y
  Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0 · 9583b9da
  由 Yu Kun 提交于 9月 12, 2019
```
Former-commit-id: 3a06caa572c2732c4e9da3e5b10cd18900225fc1
```
  9583b9da
- Y
  fix searchinfiles return status bug · 4223ad9d
  由 Yu Kun 提交于 9月 12, 2019
```
Former-commit-id: f7d2490eb6eebf366d4130e5b48adcaab6e41020
```
  4223ad9d
- W
  MS-546 Add simple mode resource_config · 0f6a6fe1
  由 wxyu 提交于 9月 12, 2019
```
Former-commit-id: 13c594c3db06dc998af041ccb85d78d92a5e8fbf
```
  0f6a6fe1
- W
  MS-546 Add simple mode resource_config · 54ec2a12
  由 wxyu 提交于 9月 12, 2019
```
Former-commit-id: d1909071f0d5e630ae8919c473083cad04778d76
```
  54ec2a12

BaiXuePrincess / milvus 与 Fork 源项目一致

BaiXuePrincess / milvus
与 Fork 源项目一致