提交 · 8c9bbc44672e0a12f442a90f722240f9dd76c21f · BaiXuePrincess / milvus

12 9月, 2019 39 次提交
- 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' · da99a9e1
  由 peng.xu 提交于 9月 12, 2019
```
fix build index error

See merge request megasearch/milvus!562

Former-commit-id: 3f42a54ffa04c2f8c53ff6228e982fac8281b4fd
```
  da99a9e1
- 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
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · e54b07cf
  由 peng.xu 提交于 9月 12, 2019
```
remove knowhere path from jenkins build script

See merge request megasearch/milvus!557

Former-commit-id: e0899c91d089951d74d51056527e52fa617ea4fd
```
  e54b07cf
- S
  Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0 · 012d1df0
  由 starlord 提交于 9月 12, 2019
```
Former-commit-id: 50170cbe70ef0111ab5c81a8472e5fee5a1ec708
```
  012d1df0
- S
  remove knowhere path from jenkins build script · b2a20f68
  由 starlord 提交于 9月 12, 2019
```
Former-commit-id: ce5cb318fc129a0dea7596dc2133fdc740700167
```
  b2a20f68
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · f08e7d61
  由 peng.xu 提交于 9月 12, 2019
```
MS-532 Add grpc server unittest

See merge request megasearch/milvus!556

Former-commit-id: 15ea56174581d9a3f62edab8e9d6670e5e53180e
```
  f08e7d61
- Y
  remove some nouse changes · 8c06e4e2
  由 Yu Kun 提交于 9月 12, 2019
```
Former-commit-id: 9b09de4cdb409f5327db7ce8966b0974eed1d3fa
```
  8c06e4e2
- Y
  Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0 · ddfc0522
  由 Yu Kun 提交于 9月 12, 2019
```
Former-commit-id: 1086979d1883a172a96f99ad5d6d03aa6b61e3f1
```
  ddfc0522
- S
  Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0 · 6f21f6c1
  由 starlord 提交于 9月 12, 2019
```
Former-commit-id: 862958802a6ea2fc33ea64cde5dbba5a7a4554bb
```
  6f21f6c1
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 9998adb3
  由 peng.xu 提交于 9月 12, 2019
```
remove gpu_cache_capacity config

See merge request megasearch/milvus!555

Former-commit-id: 684259254218b9c02a3fdaa67ffadd3dca7efc0e
```
  9998adb3
- S
  force delete lcov files · 6101b08d
  由 starlord 提交于 9月 12, 2019
```
Former-commit-id: e7312bc87d127b0e14af239a70ef88da4a7bd9fc
```
  6101b08d
- Y
  fix conflicts · 9f832656
  由 Yu Kun 提交于 9月 12, 2019
```
Former-commit-id: 5bf67736ef9c4a6dc505899a2bf5cb289c3c5aa5
```
  9f832656
- S
  Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0 · d95417f7
  由 starlord 提交于 9月 12, 2019
```
Former-commit-id: 82145d3269bdda9f17993aa75c2308faf949c74c
```
  d95417f7
- S
  remove gpu_cache_capacity config · a7ea9b28
  由 starlord 提交于 9月 12, 2019
```
Former-commit-id: 94abdd662201c9b19c79d7b7170f3e9af2c39e81
```
  a7ea9b28
- S
  remove gpu_cache_capacity config · b92d4897
  由 starlord 提交于 9月 12, 2019
```
Former-commit-id: 34cd12b8f13d4d92517cd6c5aa94fa8aa0c1cd66
```
  b92d4897
- Y
  fix conflicts · d6c314b9
  由 Yu Kun 提交于 9月 12, 2019
```
Former-commit-id: aa97e1f8864d9cf3c48c41b3670a0f315019350c
```
  d6c314b9
- Y
  fix coverage bugs · a2504c13
  由 Yu Kun 提交于 9月 12, 2019
```
Former-commit-id: 6fd2ca73cc082164c2e44301797cbade85fbe218
```
  a2504c13
- J
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 0e757625
  由 jinhai 提交于 9月 12, 2019
```
Change type

See merge request megasearch/milvus!554

Former-commit-id: 6ab97078f942f1eaa02d7f7946ffdfa0267fba8f
```
  0e757625
- J
  Change type · 26c80112
  由 jinhai 提交于 9月 12, 2019
```
Former-commit-id: da3ae3ff25ac26dd1c85a52bd8ddc5538dd42fbd
```
  26c80112
- J
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · d5fa2d01
  由 jinhai 提交于 9月 12, 2019
```
Branch 0.4.0

See merge request megasearch/milvus!553

Former-commit-id: 6e296f3d7d10786dc22d3f5a8139d94235b72c34
```
  d5fa2d01
- J
  Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0 · 457c43a9
  由 jinhai 提交于 9月 12, 2019
```
Former-commit-id: 316fb37455523a04270b87ba49824a4ef3352abe
```
  457c43a9
11 9月, 2019 1 次提交
- Y
  remove some nouse changes · 4cd64105
  由 Yu Kun 提交于 9月 11, 2019
```
Former-commit-id: c550390a97917b975fe456a733efda7d5b17c099
```
  4cd64105

BaiXuePrincess / milvus 与 Fork 源项目一致

BaiXuePrincess / milvus
与 Fork 源项目一致