提交 · 92aedc55b9c4bf967794b5bcd4461043e9bdafea · qq_35024513 / milvus

05 9月, 2019 19 次提交
- Y
  fix conflicts · 92aedc55
  由 Yu Kun 提交于 9月 05, 2019
```
Former-commit-id: e91a1292e4b65a509f1f1a749d2aac66d8d0d748
```
  92aedc55
- Y
  Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0 · 1139157e
  由 Yu Kun 提交于 9月 05, 2019
```
Former-commit-id: 301aebcf3f7733b74b0e18d42060ea1328e347b0
```
  1139157e
- Y
  fix conflicts · dc9ca498
  由 Yu Kun 提交于 9月 05, 2019
```
Former-commit-id: 117e31f7cfff33e1b5716e60e4521faa0ef4ecee
```
  dc9ca498
- J
  Merge branch 'update_gpuresource' into 'branch-0.4.0' · 2522b042
  由 jinhai 提交于 9月 05, 2019
```
MS-484 1. update faiss version 2. idmap add search config

See merge request megasearch/milvus!485

Former-commit-id: b821c0cc0075c3f0ff6a293b37488daf79c29258
```
  2522b042
- X
  MS-484 1. update faiss version 2. idmap add search config · 6b422840
  由 xj.lin 提交于 9月 05, 2019
```
Former-commit-id: e9b2131870e0a011a94c6cd2fed8166d9ebd80a5
```
  6b422840
- Y
  fix conflicts · c4536f0d
  由 Yu Kun 提交于 9月 05, 2019
```
Former-commit-id: d23695bdff018e5c94e92286307c6dc52df8ee93
```
  c4536f0d
- Y
  Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0 · 3f6c9ce7
  由 Yu Kun 提交于 9月 05, 2019
```
Former-commit-id: 38cbc16947b3d4d3fabf871a531209fcf8f4ceff
```
  3f6c9ce7
- Y
  fix conflicts · 2fbad4e4
  由 Yu Kun 提交于 9月 05, 2019
```
Former-commit-id: 1e15db53dc0af40678969cd1111458582c055223
```
  2fbad4e4
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 5986de3f
  由 peng.xu 提交于 9月 05, 2019
```
refine code

See merge request megasearch/milvus!483

Former-commit-id: 5323139fbe9f0e080d6287754651ef285cb461a9
```
  5986de3f
- S
  refine code · 12bb81c5
  由 starlord 提交于 9月 05, 2019
```
Former-commit-id: d878f03aeb45f3a78d1e7676de4645e6fe4469f0
```
  12bb81c5
- Y
  fix conflicts · e8429a19
  由 Yu Kun 提交于 9月 05, 2019
```
Former-commit-id: 91a7705ab4b0d359e3044e40ffb34f1ab650011d
```
  e8429a19
- Y
  MS-482 Change search stream transport to unary in grpc · 0fb029ee
  由 Yu Kun 提交于 9月 05, 2019
```
Former-commit-id: d2230e4dbe24d3e4176cf1d8b256e8b7b68f91b4
```
  0fb029ee
- S
  Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0 · a30a638d
  由 starlord 提交于 9月 05, 2019
```
Former-commit-id: d4c83bacbbdeee3c95ddfee4542e56cbc27aa248
```
  a30a638d
- J
  Merge branch 'update_gpuresource' into 'branch-0.4.0' · 62775f49
  由 jinhai 提交于 9月 05, 2019
```
MS-476 1. default value

See merge request megasearch/milvus!482

Former-commit-id: d5bd3ac23fe8eacb867c676bdd91ddec7c3fb26b
```
  62775f49
- X
  MS-476 1. default value · ea0443c8
  由 xj.lin 提交于 9月 05, 2019
```
Former-commit-id: 57341d845d864f22604890004af28708f9fffea9
```
  ea0443c8
- J
  Merge branch 'update_gpuresource' into 'branch-0.4.0' · 4c5f7ea8
  由 jinhai 提交于 9月 05, 2019
```
MS-476 1. fix resource mgr config

See merge request megasearch/milvus!481

Former-commit-id: 7742d4b3e8fa8d4059bbbedb95a152f3f2f68acd
```
  4c5f7ea8
- X
  MS-476 1. enable default value · b2488256
  由 xj.lin 提交于 9月 05, 2019
```
Former-commit-id: 1692514a0749b7fdaaf66679c07903398efd3b7e
```
  b2488256
- S
  Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0 · c118d15f
  由 starlord 提交于 9月 05, 2019
```
Former-commit-id: d1768235b11458b3199b5b7beaa0836d4d7f791b
```
  c118d15f
- S
  refine code · e441dea5
  由 starlord 提交于 9月 05, 2019
```
Former-commit-id: b873ea2628269323db8230c6c82081cfbefc79b2
```
  e441dea5
04 9月, 2019 16 次提交
- X
  MS-476 1. fix resource mgr config · ee303a52
  由 xj.lin 提交于 9月 04, 2019
```
Former-commit-id: 3914417a5fa92e5fe59868e3a0ccb0885fea7f9d
```
  ee303a52
- J
  Merge branch 'new_gpureource' into 'branch-0.4.0' · 1e3965a5
  由 jinhai 提交于 9月 04, 2019
```
MS-476 improve gpu performance

See merge request megasearch/milvus!479

Former-commit-id: 5711daa911c2c6c090593b5eaf0ac0514b213d38
```
  1e3965a5
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 2bfec26c
  由 peng.xu 提交于 9月 04, 2019
```
MS-458 fix bug for keep building index for one file when no gpu resource

See merge request megasearch/milvus!480

Former-commit-id: 6454851f6ccedf216e827105a51306af5e430c3f
```
  2bfec26c
- Y
  MS-458 fix bug for keep building index for one file when no gpu resource · ece4f162
  由 yudong.cai 提交于 9月 04, 2019
```
Former-commit-id: 3fbf5481c3fa9660e6a1baf26958cb9e6a7cbba7
```
  ece4f162
- X
  MS-476 1. add resource mgr config · 35492ec0
  由 xj.lin 提交于 9月 04, 2019
```
Former-commit-id: 5cae0ea977e93184ad34de39983ef46cb1ab075b
```
  35492ec0
- X
  Merge branch 'branch-0.4.0' into new_gpureource · d97f1bd7
  由 xj.lin 提交于 9月 04, 2019
```
Former-commit-id: 559676452dbcf72cb2a3f195c5233ee45bc97ef3
```
  d97f1bd7
- X
  MS-476 1. update gpuresource mgr 2. improve gpu index performance · 1b4a9085
  由 xj.lin 提交于 9月 04, 2019
```
Former-commit-id: 0659a3ded3c00befbddc991b3017e76cfca0070d
```
  1b4a9085
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 7a718f47
  由 peng.xu 提交于 9月 04, 2019
```
remove boring log

See merge request megasearch/milvus!478

Former-commit-id: 06fed23eb403bb908fb1f01b8945159bc63b9523
```
  7a718f47
- S
  remove boring log · b136286c
  由 starlord 提交于 9月 04, 2019
```
Former-commit-id: 2be0fd0de169ff85565e578833e00659ca3cd319
```
  b136286c
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 7b548229
  由 peng.xu 提交于 9月 04, 2019
```
MS-471 code coverage run failed

See merge request megasearch/milvus!477

Former-commit-id: 2d61f481c77acd95be9a9ffc71712ac89fc2e0ac
```
  7b548229
- S
  Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0 · 1e06f530
  由 starlord 提交于 9月 04, 2019
```
Former-commit-id: 68f01cc8899a4eec24aca874d890420db5216177
```
  1e06f530
- J
  MS-471 code coverage run failed · f4aea7db
  由 jinhai 提交于 9月 04, 2019
```
Former-commit-id: a1623ef97423b1ed4086c70b5fb8965efac25580
```
  f4aea7db
- J
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 6afa9b88
  由 jinhai 提交于 9月 04, 2019
```
MS-471 code coverage run failed

See merge request megasearch/milvus!476

Former-commit-id: a2589b3767efcb909f825b22246bcf97e8f265eb
```
  6afa9b88
- S
  MS-471 code coverage run failed · 8d748031
  由 starlord 提交于 9月 04, 2019
```
Former-commit-id: 9aea558d811b52f9e8349567a3746c3b89b683db
```
  8d748031
- J
  Merge branch 'fixBug' into 'branch-0.4.0' · a1bf3d44
  由 jinhai 提交于 9月 04, 2019
```
MS-467: temp revert

See merge request megasearch/milvus!475

Former-commit-id: 8c9c098a5315b97817f070562070058c36a809d2
```
  a1bf3d44
- Z
  temp revert · 89a29188
  由 zhiru 提交于 9月 04, 2019
```
Former-commit-id: afde77cd234773c595196d95efbb34ad93ca39ff
```
  89a29188
03 9月, 2019 5 次提交
- S
  Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0 · 6376caae
  由 starlord 提交于 9月 03, 2019
```
Former-commit-id: 60a150ae5fa752e083ceb53e4492ae425f38ffb7
```
  6376caae
- J
  Merge branch 'fixBug' into 'branch-0.4.0' · 79a861ed
  由 jinhai 提交于 9月 03, 2019
```
MS-467: fix mysql db test bug

See merge request megasearch/milvus!474

Former-commit-id: 393ee7e7bae6fc0f77d3b0b732cd74ee07faf9a8
```
  79a861ed
- J
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · e940d3c4
  由 jinhai 提交于 9月 03, 2019
```
refine code

See merge request megasearch/milvus!473

Former-commit-id: 9cf729c16944ec29956944a88b4578fd9795b6c9
```
  e940d3c4
- S
  Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0 · 1619acb5
  由 starlord 提交于 9月 03, 2019
```
Former-commit-id: fb9720bc8bae865778e337335db1cfbad37209a4
```
  1619acb5
- Z
  fix mysql db test bug · e22d86d0
  由 zhiru 提交于 9月 03, 2019
```
Former-commit-id: 517ac31e54b412259295db51f3b4c7ad42445f13
```
  e22d86d0

qq_35024513 / milvus 与 Fork 源项目一致

qq_35024513 / milvus
与 Fork 源项目一致