提交 · 522176ca141d40a7bcbc3da8654ff2a3659c901f · BaiXuePrincess / milvus

28 9月, 2019 3 次提交
- G
  format code by clang-tidy · 522176ca
  由 groot 提交于 9月 28, 2019
```
Former-commit-id: 524e527a20b8364c32d26f345ebe333e35f167f9
```
  522176ca
- P
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · 9eb09e86
  由 peng.xu 提交于 9月 28, 2019
```
format code by clang-format

See merge request megasearch/milvus!637

Former-commit-id: ba655e801131a4d3a64fd3125e301623f1760a2e
```
  9eb09e86
- G
  format code by clang-format · c80c1857
  由 groot 提交于 9月 28, 2019
```
Former-commit-id: 97f249138b1a92061368ce86211fbd443fea61eb
```
  c80c1857
27 9月, 2019 34 次提交
- J
  Merge branch 'enable_nsg' into 'branch-0.5.0' · 19e10f99
  由 jinhai 提交于 9月 27, 2019
```
MS-596 enable knowhere and fix compile error

See merge request megasearch/milvus!636

Former-commit-id: 6aac5df1fe238ced58b59558f9b80ac05a0480dd
```
  19e10f99
- X
  Merge branch 'branch-0.5.0' into enable_nsg · b7b47336
  由 xiaojun.lin 提交于 9月 27, 2019
```
# Conflicts:
#	cpp/unittest/wrapper/wrapper_test.cpp


Former-commit-id: 1557170f5fd4f22da8df4e5b1d99c9a02ecb34b3
```
  b7b47336
- X
  MS-596 enable knowhere and fix compile error · 3426f1c9
  由 xiaojun.lin 提交于 9月 27, 2019
```
Former-commit-id: fee988bc22de9ac8adeb29342d0e7e9c37278304
```
  3426f1c9
- P
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · 7785a3a6
  由 peng.xu 提交于 9月 27, 2019
```
code stype xml

See merge request megasearch/milvus!635

Former-commit-id: 97055f722362c487cb1d23a4d8926fba931fa229
```
  7785a3a6
- G
  code stype xml · 2bf3864f
  由 groot 提交于 9月 27, 2019
```
Former-commit-id: eff971f14726c9d13603968bd13a09e4f5ed62e2
```
  2bf3864f
- P
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · 9dd785b9
  由 peng.xu 提交于 9月 27, 2019
```
format unittest code

See merge request megasearch/milvus!634

Former-commit-id: a623271e4b5922d917d25fe2d4a851eab470f6a4
```
  9dd785b9
- G
  format unittest code · cc07a61c
  由 groot 提交于 9月 27, 2019
```
Former-commit-id: 4a1ba3a448c59d63d390e2269829da4f16b418fb
```
  cc07a61c
- G
  format unittest code · 7cdbf34d
  由 groot 提交于 9月 27, 2019
```
Former-commit-id: ed9b3c2a16dde0d3ab29bd9960f2eaa2ac1e13ac
```
  7cdbf34d
- P
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · 7f3acc05
  由 peng.xu 提交于 9月 27, 2019
```
MS-574 rename some configurations

See merge request megasearch/milvus!633

Former-commit-id: 2f36164d15477ce539269929c0ab5eb3c61021f5
```
  7f3acc05
- Y
  MS-574 rename some configurations · 21da5e67
  由 yudong.cai 提交于 9月 27, 2019
```
Former-commit-id: 4fabcc8a1dda1ca8998362c9466dd4d58f45d68a
```
  21da5e67
- J
  Merge branch 'refactor_knowhere' into 'branch-0.5.0' · d9b44f53
  由 jinhai 提交于 9月 27, 2019
```
MS-565 Refactor knowhere

See merge request megasearch/milvus!632

Former-commit-id: 9e90893c693af5d3c7061800a5dbd8da92d510ac
```
  d9b44f53
- J
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · cb70c1c0
  由 jinhai 提交于 9月 27, 2019
```
MS-574 update config comments

See merge request megasearch/milvus!631

Former-commit-id: 75f773a4b190e521a00f6769cf3ea9df534ae48a
```
  cb70c1c0
- Y
  MS-574 update config comments · cb507c90
  由 yudong.cai 提交于 9月 27, 2019
```
Former-commit-id: 63b743ab717e5e3b07ea64cdd240ab132ac59c28
```
  cb507c90
- J
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · 7d47389f
  由 jinhai 提交于 9月 27, 2019
```
MS-595 Fix compiling error on gcc 7.4

See merge request megasearch/milvus!630

Former-commit-id: 0518f474ed83357c548a7cf7833847a08a800019
```
  7d47389f
- J
  MS-595 Fix compiling error on gcc 7.4 · cd5751af
  由 JinHai-CN 提交于 9月 27, 2019
```
Former-commit-id: ffe5d78d8a4170261423a004f21bf0c969f0def5
```
  cd5751af
- X
  Merge branch 'branch-0.5.0' into refactor_knowhere · fec91d2f
  由 xiaojun.lin 提交于 9月 27, 2019
```
Former-commit-id: 601fd72c60b65bb973d685ce4a8fa33f9c36b024
```
  fec91d2f
- X
  MS-565 remove jsoncons v2 · 993558a0
  由 xiaojun.lin 提交于 9月 27, 2019
```
Former-commit-id: 64e514a130640eae43c4e9657a3fcbe2efac3074
```
  993558a0
- P
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · 209fc32a
  由 peng.xu 提交于 9月 27, 2019
```
format metric code

See merge request megasearch/milvus!629

Former-commit-id: a13b8829a4d8b02b0d20b270160e0d42af113239
```
  209fc32a
- G
  Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0 · 3ced3f9c
  由 groot 提交于 9月 27, 2019
```
Former-commit-id: 9b636e42f2062c6096cbf3561826e8c86296b5bd
```
  3ced3f9c
- G
  format metric code · bb430932
  由 groot 提交于 9月 27, 2019
```
Former-commit-id: c883acb7b9818bdb97ed7a0ba3ed30d2ef58be40
```
  bb430932
- P
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · e0edee88
  由 peng.xu 提交于 9月 27, 2019
```
remove MetricBase.h from code coverage check

See merge request megasearch/milvus!628

Former-commit-id: ca0dbd01c8527cdaa9204b70dbda56138b2b064b
```
  e0edee88
- Y
  remove MetricBase.h from code coverage check · b2f2412d
  由 yudong.cai 提交于 9月 27, 2019
```
Former-commit-id: 0dda95f5dbcd46f4d2e8c014e4aa749e54457afb
```
  b2f2412d
- P
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · a7e92aea
  由 peng.xu 提交于 9月 27, 2019
```
format scheduler code

See merge request megasearch/milvus!627

Former-commit-id: d3d64b45ccfd969cca76b9b3b201aabbd56810f3
```
  a7e92aea
- G
  format db code · 7ba890b9
  由 groot 提交于 9月 27, 2019
```
Former-commit-id: b6756f8b981219f72e0291f7a1e5b08ef7327d4c
```
  7ba890b9
- G
  Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0 · 292331ad
  由 groot 提交于 9月 27, 2019
```
Former-commit-id: 8026376277e9b6f208ca99ed21da7cb6d250acf2
```
  292331ad
- G
  format scheduler code · bc8e8981
  由 groot 提交于 9月 27, 2019
```
Former-commit-id: 0336960c0a871bbb835f31eb53945603bd2fcf05
```
  bc8e8981
- P
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · fe3952c6
  由 peng.xu 提交于 9月 27, 2019
```
MS-574 add API ResetDefaultConfig()

See merge request megasearch/milvus!626

Former-commit-id: 54f414676d566571e8a042307f2bc94329f498dd
```
  fe3952c6
- Y
  MS-574 add API ResetDefaultConfig() · 4430fc37
  由 yudong.cai 提交于 9月 27, 2019
```
Former-commit-id: 839a818bae31fcb37d9b7024d1d44da815c36c0d
```
  4430fc37
- P
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · 2705fa83
  由 peng.xu 提交于 9月 27, 2019
```
format code

See merge request megasearch/milvus!625

Former-commit-id: adfbacea676947f3656543765eea3fbec796440e
```
  2705fa83
- G
  format sdk code · d748ea74
  由 groot 提交于 9月 27, 2019
```
Former-commit-id: a7c0c81272bcdf7c862dcbb29c919e95149af4db
```
  d748ea74
- G
  Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0 · 338d551a
  由 groot 提交于 9月 27, 2019
```
Former-commit-id: 704e6882e1f26d4c3c532739a0c28393d6e0bfd8
```
  338d551a
- P
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · b5127c44
  由 peng.xu 提交于 9月 27, 2019
```
MS-574 update config unittest

See merge request megasearch/milvus!624

Former-commit-id: 68f323600415e1d05f00bee94c00709a409364b3
```
  b5127c44
- Y
  MS-574 update config unittest · f00b1317
  由 yudong.cai 提交于 9月 27, 2019
```
Former-commit-id: 2d4450e4d602429f5adf051ca1df20caa51595b2
```
  f00b1317
- G
  format cache code · ad302f87
  由 groot 提交于 9月 27, 2019
```
Former-commit-id: bf1929d2489637b19ea2a7e85928d24fddf92202
```
  ad302f87
26 9月, 2019 3 次提交
- J
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · fb10145d
  由 jinhai 提交于 9月 26, 2019
```
format utils code

See merge request megasearch/milvus!623

Former-commit-id: 078dc34a36f236de2945b63d4624f4f2a72bbf86
```
  fb10145d
- G
  Merge branch 'branch-0.5.0' of 192.168.1.105:groot/vecwise_engine into branch-0.5.0 · 36a43466
  由 groot 提交于 9月 26, 2019
```
Former-commit-id: 6a13fe1381c171be5fd53347f2c21b97276c2bba
```
  36a43466
- G
  fix build error · 8cd27815
  由 groot 提交于 9月 26, 2019
```
Former-commit-id: 45873805d6359b60fe4bb6fd6131b925040be902
```
  8cd27815

BaiXuePrincess / milvus 与 Fork 源项目一致

BaiXuePrincess / milvus
与 Fork 源项目一致