提交 · 464a341523737d5fb56269aa7df5859efebfc410 · BaiXuePrincess / milvus

28 9月, 2019 2 次提交

Merge branch 'branch-0.5.0' into 'branch-0.5.0' · 464a3415

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

format code by clang-format

See merge request megasearch/milvus!637

Former-commit-id: 5ef398b80b258437c7edd3543bb1c0721e8a4078

464a3415

S
format code by clang-format · 58b82398
由 starlord 提交于 9月 28, 2019
```
Former-commit-id: c817c67a409054a49da2be878872e885a0b3e041
```
58b82398

27 9月, 2019 34 次提交
- J
  Merge branch 'enable_nsg' into 'branch-0.5.0' · c181e405
  由 jinhai 提交于 9月 27, 2019
```
MS-596 enable knowhere and fix compile error

See merge request megasearch/milvus!636

Former-commit-id: 39892263eaf578f745a608a4a03305c27f9fa0f3
```
  c181e405
- X
  Merge branch 'branch-0.5.0' into enable_nsg · c99b3b4a
  由 xiaojun.lin 提交于 9月 27, 2019
```
# Conflicts:
#	cpp/unittest/wrapper/wrapper_test.cpp


Former-commit-id: 4f7c4005a64b47a6c6874cd6c1db2e7e72b9f588
```
  c99b3b4a
- X
  MS-596 enable knowhere and fix compile error · c6501ec0
  由 xiaojun.lin 提交于 9月 27, 2019
```
Former-commit-id: 75c435ef22ceec6f07e92e42f99b369657e3911a
```
  c6501ec0
- P
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · afc55cca
  由 peng.xu 提交于 9月 27, 2019
```
code stype xml

See merge request megasearch/milvus!635

Former-commit-id: 868a91710499b531ed3788f29db1b4d5266ce7e7
```
  afc55cca
- S
  code stype xml · 29e93e00
  由 starlord 提交于 9月 27, 2019
```
Former-commit-id: 811cc247f82d0aba97e6dd491cb5d5003e545f1d
```
  29e93e00
- P
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · ae9e7802
  由 peng.xu 提交于 9月 27, 2019
```
format unittest code

See merge request megasearch/milvus!634

Former-commit-id: 38c8befef43f04c9c60534769d6333f57aadb8ce
```
  ae9e7802
- S
  format unittest code · 5220a393
  由 starlord 提交于 9月 27, 2019
```
Former-commit-id: 876a54437b8d5150a2a3d2b4c16b4983783cef42
```
  5220a393
- S
  format unittest code · c9320225
  由 starlord 提交于 9月 27, 2019
```
Former-commit-id: f5979db268dc71e79ef556617fb8992dda04a422
```
  c9320225
- P
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · 37e26cce
  由 peng.xu 提交于 9月 27, 2019
```
MS-574 rename some configurations

See merge request megasearch/milvus!633

Former-commit-id: b17570b8aa98097119eefa80330b7043bb9631f9
```
  37e26cce
- Y
  MS-574 rename some configurations · 8a6e8364
  由 yudong.cai 提交于 9月 27, 2019
```
Former-commit-id: a7e700ae417c28527f665ac919666d3a22a73707
```
  8a6e8364
- J
  Merge branch 'refactor_knowhere' into 'branch-0.5.0' · 81c37afc
  由 jinhai 提交于 9月 27, 2019
```
MS-565 Refactor knowhere

See merge request megasearch/milvus!632

Former-commit-id: bc42aef029e853c270141d5a5727fed0c4f624fe
```
  81c37afc
- J
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · 4d72034f
  由 jinhai 提交于 9月 27, 2019
```
MS-574 update config comments

See merge request megasearch/milvus!631

Former-commit-id: dc99628c293285c5037d0d3e58e5d4ebe949e538
```
  4d72034f
- Y
  MS-574 update config comments · f64380ae
  由 yudong.cai 提交于 9月 27, 2019
```
Former-commit-id: d9b088a15e16c43be8eae1657184d30ade8e3053
```
  f64380ae
- J
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · 0b7d3487
  由 jinhai 提交于 9月 27, 2019
```
MS-595 Fix compiling error on gcc 7.4

See merge request megasearch/milvus!630

Former-commit-id: 0a29043919a3f1f014bd36046eee1b4c39a2f076
```
  0b7d3487
- J
  MS-595 Fix compiling error on gcc 7.4 · 88ced5a7
  由 JinHai-CN 提交于 9月 27, 2019
```
Former-commit-id: 2d408646efb2d8bbc48803a8d39be8570751778e
```
  88ced5a7
- X
  Merge branch 'branch-0.5.0' into refactor_knowhere · 2652b3bc
  由 xiaojun.lin 提交于 9月 27, 2019
```
Former-commit-id: 981b23f103df4dfdd5c4bcb571b2aad2d973de03
```
  2652b3bc
- X
  MS-565 remove jsoncons v2 · 180600fb
  由 xiaojun.lin 提交于 9月 27, 2019
```
Former-commit-id: a37cbd9b67c66fca6e4ef08519e5f48248985c98
```
  180600fb
- P
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · 7268cfb3
  由 peng.xu 提交于 9月 27, 2019
```
format metric code

See merge request megasearch/milvus!629

Former-commit-id: b3a568226c079750930027bfb617063736ed0cfd
```
  7268cfb3
- S
  Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0 · aac8065c
  由 starlord 提交于 9月 27, 2019
```
Former-commit-id: 75f2a01bc3bbbecae8cf25d628d02338019a418e
```
  aac8065c
- S
  format metric code · ca1ab56c
  由 starlord 提交于 9月 27, 2019
```
Former-commit-id: ea430e044ae3c93b051c4ac6261cfe3c241ae80b
```
  ca1ab56c
- P
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · f8460783
  由 peng.xu 提交于 9月 27, 2019
```
remove MetricBase.h from code coverage check

See merge request megasearch/milvus!628

Former-commit-id: b58503ea4a8af6a90cfc88df11b83a4cc7e4e4d7
```
  f8460783
- Y
  remove MetricBase.h from code coverage check · 45a5d644
  由 yudong.cai 提交于 9月 27, 2019
```
Former-commit-id: a13611379840983ac4b2ea9573a353485d4a9ac6
```
  45a5d644
- P
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · b046049f
  由 peng.xu 提交于 9月 27, 2019
```
format scheduler code

See merge request megasearch/milvus!627

Former-commit-id: 4b46d2b89a1309faa30580dbcf58111c13c68ae5
```
  b046049f
- S
  format db code · a0e4d19e
  由 starlord 提交于 9月 27, 2019
```
Former-commit-id: 3b4781e4c000beea41baddf54635d7bbe7ea5f52
```
  a0e4d19e
- S
  Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0 · 6ed49d1d
  由 starlord 提交于 9月 27, 2019
```
Former-commit-id: f1c33b228f904ee3976f81712da9945260d79f0b
```
  6ed49d1d
- S
  format scheduler code · 965ca2c9
  由 starlord 提交于 9月 27, 2019
```
Former-commit-id: c2ff1ac702af62b4968a192d12b258bc90dd0b50
```
  965ca2c9
- P
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · d4babb6d
  由 peng.xu 提交于 9月 27, 2019
```
MS-574 add API ResetDefaultConfig()

See merge request megasearch/milvus!626

Former-commit-id: 118e04f2cf6967582c4f959bad67257ab648c6be
```
  d4babb6d
- Y
  MS-574 add API ResetDefaultConfig() · 85d3c9d0
  由 yudong.cai 提交于 9月 27, 2019
```
Former-commit-id: 475b048bb6386ffd3bb09a229694e954f8fc67e7
```
  85d3c9d0
- P
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · 104f47a4
  由 peng.xu 提交于 9月 27, 2019
```
format code

See merge request megasearch/milvus!625

Former-commit-id: dddc1624ff602429646b348f15e645e8b17624bd
```
  104f47a4
- S
  format sdk code · a4f1a639
  由 starlord 提交于 9月 27, 2019
```
Former-commit-id: be186a4338c2921bd22bae6091e6f145f20ccc46
```
  a4f1a639
- S
  Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0 · 92bb4d26
  由 starlord 提交于 9月 27, 2019
```
Former-commit-id: b272a86b888eee87fa36a232f0ce298c4e754ab9
```
  92bb4d26
- P
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · c8f43662
  由 peng.xu 提交于 9月 27, 2019
```
MS-574 update config unittest

See merge request megasearch/milvus!624

Former-commit-id: 5d035110fac8b66873d0014035017cd0733e15e5
```
  c8f43662
- Y
  MS-574 update config unittest · 3a6448b3
  由 yudong.cai 提交于 9月 27, 2019
```
Former-commit-id: f60c3ada442acea12827bcae136a29adbe6f9c2e
```
  3a6448b3
- S
  format cache code · 46455352
  由 starlord 提交于 9月 27, 2019
```
Former-commit-id: 99ff6affb78c09941a59c53183427a14b8ff00d1
```
  46455352
26 9月, 2019 4 次提交
- J
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · 6ac9c1a0
  由 jinhai 提交于 9月 26, 2019
```
format utils code

See merge request megasearch/milvus!623

Former-commit-id: 3c2551066c29720fad91520ed2edfa0c872dff1c
```
  6ac9c1a0
- S
  Merge branch 'branch-0.5.0' of 192.168.1.105:groot/vecwise_engine into branch-0.5.0 · 5585aaff
  由 starlord 提交于 9月 26, 2019
```
Former-commit-id: e94e95e51b4d977b1529a2a04e9598eb2ea625bb
```
  5585aaff
- S
  fix build error · 2a2a070c
  由 starlord 提交于 9月 26, 2019
```
Former-commit-id: 9b595c80931e17acf676f03e1f3b4cdcc9a40b94
```
  2a2a070c
- S
  fix build error · 5b0a13bf
  由 starlord 提交于 9月 26, 2019
```
Former-commit-id: 3416c37d548be2e04dc2814830d935baab5104cb
```
  5b0a13bf

BaiXuePrincess / milvus 与 Fork 源项目一致

BaiXuePrincess / milvus
与 Fork 源项目一致