提交 · dde40abe5e6801bf76da9de216bd469c7e42b1af · BaiXuePrincess / milvus

17 9月, 2019 1 次提交

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

由 jinhai 提交于 9月 17, 2019

MS-552 Add and change the easylogging library

See merge request megasearch/milvus!567

Former-commit-id: e8f604b5a6ff74d012ee712bb1be22b812def760

dde40abe

16 9月, 2019 5 次提交
- H
  change cmakelist · ffbfcf38
  由 Heisenberg 提交于 9月 16, 2019
```
Former-commit-id: 35ef1c3ef87e6f332d4b2436bc4f3e39bff10715
```
  ffbfcf38
- H
  Merge branch 'branch-0.5.0' into branch-0.5.0-improve_log · 0361b66b
  由 Heisenberg 提交于 9月 16, 2019
```
Former-commit-id: 3683aea3470f71b1db97bd3c4f7aab5401baaf66
```
  0361b66b
- H
  MS-552 Add and change the easylogging library · 92243718
  由 Heisenberg 提交于 9月 16, 2019
```
Former-commit-id: 46d2503a638b9a6490800cf9544011a1383f8af6
```
  92243718
- J
  Merge branch 'branch-0.5.0' into 'branch-0.5.0' · 61877f62
  由 jinhai 提交于 9月 16, 2019
```
test case level added

See merge request megasearch/milvus!566

Former-commit-id: 74de5a6d01deca0e36f33d5181b33951abb0df32
```
  61877f62
- Z
  test case level added · d930413b
  由 zhenwu 提交于 9月 16, 2019
```
Former-commit-id: 952e1216a30ce891feaf927e552c3b57130ee4d1
```
  d930413b
12 9月, 2019 34 次提交
- J
  Update CHANGELOGS · 5d48bebb
  由 jinhai 提交于 9月 12, 2019
```
Former-commit-id: 8a7a8b70236972bf93a47aad6d92ad7121e510a3
```
  5d48bebb
- J
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 33762b47
  由 jinhai 提交于 9月 12, 2019
```
Update lockguard

See merge request megasearch/milvus!565

Former-commit-id: ce3a72a14f79562e6b9adf7bb13a6ded7fc90184
```
  33762b47
- J
  Update lockguard · a07ff1bd
  由 jinhai 提交于 9月 12, 2019
```
Former-commit-id: 1d64ce5d75fbc5132e363cd67784e7320a9c73e6
```
  a07ff1bd
- J
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 6e96c2f8
  由 jinhai 提交于 9月 12, 2019
```
Branch 0.4.0

See merge request megasearch/milvus!564

Former-commit-id: ec3428c4a18b17fcd1468db6dbbc61af4212d7fa
```
  6e96c2f8
- J
  Fix compile error · 75c3532a
  由 jinhai 提交于 9月 12, 2019
```
Former-commit-id: 647533260413c6996f86cba942696eda1697b449
```
  75c3532a
- J
  Merge branch 'branch-1.4.0' of http://192.168.1.105:6060/jinhai/milvus into branch-0.4.0 · cdbe5ae3
  由 jinhai 提交于 9月 12, 2019
```
Former-commit-id: c5796ec6b50fc427e6257d09aedc68f99dc5effd
```
  cdbe5ae3
- J
  Fix boost url · 9fcccd1f
  由 jinhai 提交于 9月 12, 2019
```
Former-commit-id: 008329cbacec4baa0394145dd1a9f1ca5a0d60fb
```
  9fcccd1f
- J
  Merge branch 'branch-1.4.0' of http://192.168.1.105:6060/jinhai/milvus into branch-0.4.0 · ace9f3cd
  由 jinhai 提交于 9月 12, 2019
```
Former-commit-id: 93c006785a77b165a563823a32cf0a48821d086f
```
  ace9f3cd
- J
  Add merge mutex · d87a5be8
  由 jinhai 提交于 9月 12, 2019
```
Former-commit-id: beea144471d8f774573a3b5653657871303aada2
```
  d87a5be8
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 4431d8f7
  由 peng.xu 提交于 9月 12, 2019
```
fix scheduler unittest error

See merge request megasearch/milvus!563

Former-commit-id: c7e536745ffb08f12780ddac1cec2ae1177cafea
```
  4431d8f7
- G
  Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0 · aa5c0ba7
  由 groot 提交于 9月 12, 2019
```
Former-commit-id: fc20f2918ae8e78e204f631093e669e7e2c45efd
```
  aa5c0ba7
- G
  fix scheduler unittest error · dc565716
  由 groot 提交于 9月 12, 2019
```
Former-commit-id: c05f6cbc78b80051890b672f14093a16fdc37eec
```
  dc565716
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 369860eb
  由 peng.xu 提交于 9月 12, 2019
```
fix build index error

See merge request megasearch/milvus!562

Former-commit-id: fb1737ba97d41253a104ad44afb35c81c71e2708
```
  369860eb
- G
  Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0 · af541659
  由 groot 提交于 9月 12, 2019
```
Former-commit-id: 057de5247ec6b5a9b99b7c3753aa415b02273eb6
```
  af541659
- G
  fix build index error · d7063f4c
  由 groot 提交于 9月 12, 2019
```
Former-commit-id: ec0e7fb6e6ba20ff4903dfc9af57715fa6288109
```
  d7063f4c
- J
  Merge branch 'ms549' into 'branch-0.4.0' · 19ef5547
  由 jinhai 提交于 9月 12, 2019
```
MS-549 server crash when search and train on same gpu

See merge request megasearch/milvus!561

Former-commit-id: 15dca05839512d35a70daf31c55ea0178afd4b70
```
  19ef5547
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · b193aee9
  由 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: 2c0a257547fa52e14abadc0e39a7069cd3b12140
```
  b193aee9
- Y
  MS-543 send error status to sdk when load index fail · 4d9de429
  由 yudong.cai 提交于 9月 12, 2019
```
Former-commit-id: e962237efb825dd1a578a038ee2f384bcb59af84
```
  4d9de429
- X
  MS-549 server crash when search and train on same gpu · fba6594a
  由 xj.lin 提交于 9月 12, 2019
```
Former-commit-id: 324b060d58351237c992cd3ab721074a2b23929a
```
  fba6594a
- Y
  MS-543 send error status to sdk when load index fail · 26a2e482
  由 yudong.cai 提交于 9月 12, 2019
```
Former-commit-id: 231d5e247ea422ab7dcdff0e8ef8a4025fbf5ce5
```
  26a2e482
- Y
  Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0 · 420a2f50
  由 yudong.cai 提交于 9月 12, 2019
```
Former-commit-id: 69ba1a6404fc6605e16a794cdf3d6e3e9be5f660
```
  420a2f50
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 854c20d6
  由 peng.xu 提交于 9月 12, 2019
```
MS-546 Add simple mode resource_config

See merge request megasearch/milvus!558

Former-commit-id: 2ff1149a9569b106de3c9eaeddb3c08a773d6d23
```
  854c20d6
- W
  solve conflicts · b268bf81
  由 wxyu 提交于 9月 12, 2019
```
Former-commit-id: d64696d9f6ce036dfa3cba8790070e98f3ccfb06
```
  b268bf81
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · f3a0ffd9
  由 peng.xu 提交于 9月 12, 2019
```
fix searchinfiles return status bug

See merge request megasearch/milvus!559

Former-commit-id: 6a44fc30726fb4d61c23ed4f772f5fa863bc2e74
```
  f3a0ffd9
- Y
  Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0 · a9da9aa8
  由 Yu Kun 提交于 9月 12, 2019
```
Former-commit-id: 84f94228f3f1bdba6615f6016e1f24b7ef551ef8
```
  a9da9aa8
- Y
  fix searchinfiles return status bug · a47cfdc2
  由 Yu Kun 提交于 9月 12, 2019
```
Former-commit-id: 65a2b75097fc4fd17838a6fb9971983f8ddbd9eb
```
  a47cfdc2
- W
  MS-546 Add simple mode resource_config · 98e5a5ac
  由 wxyu 提交于 9月 12, 2019
```
Former-commit-id: 80951b6faf224a1296926dac463b380d7106fde7
```
  98e5a5ac
- W
  MS-546 Add simple mode resource_config · 39d63b33
  由 wxyu 提交于 9月 12, 2019
```
Former-commit-id: 25f95d9c8c3adc108c3ec17954f33bbfa9e48d08
```
  39d63b33
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · d87ce6e2
  由 peng.xu 提交于 9月 12, 2019
```
remove knowhere path from jenkins build script

See merge request megasearch/milvus!557

Former-commit-id: c9e1614a294d723a29cee42ecf4be28aa79551fc
```
  d87ce6e2
- G
  Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0 · c89b3fd2
  由 groot 提交于 9月 12, 2019
```
Former-commit-id: 486957c9e1659544502af8061850dd02015f7132
```
  c89b3fd2
- G
  remove knowhere path from jenkins build script · bc28d53a
  由 groot 提交于 9月 12, 2019
```
Former-commit-id: 6350b26ea9f95c9c64a5ce3ac8c99054eaaad8d0
```
  bc28d53a
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 314f37f2
  由 peng.xu 提交于 9月 12, 2019
```
MS-532 Add grpc server unittest

See merge request megasearch/milvus!556

Former-commit-id: a7d6a1e9abac2af16e9bdb2d4ae86930947294b7
```
  314f37f2
- Y
  remove some nouse changes · 27e414a9
  由 Yu Kun 提交于 9月 12, 2019
```
Former-commit-id: 35daa07d262148234823fcc9d85d9fc3fb0b7711
```
  27e414a9
- Y
  Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0 · b6b84373
  由 Yu Kun 提交于 9月 12, 2019
```
Former-commit-id: b0fd8692bd64faa02cc1ba2d0211c4ac961dc6a3
```
  b6b84373

BaiXuePrincess / milvus 与 Fork 源项目一致

BaiXuePrincess / milvus
与 Fork 源项目一致