提交 · 9379ec4990d20f525da3552e11e2a95dfa4c02bb · BaiXuePrincess / milvus

14 8月, 2019 5 次提交
- G
  fix conflict · 9379ec49
  由 groot 提交于 8月 14, 2019
```
Former-commit-id: e8e03d39c85e40336a82b108ea5341ac8bf87dac
```
  9379ec49
- G
  MS-350 remove submodule · 60d35069
  由 groot 提交于 8月 14, 2019
```
Former-commit-id: d8efcd57d009513f48c2d998a7f23ef69b350fcc
```
  60d35069
- G
  remove knowhere submodule · ce6bd95b
  由 groot 提交于 8月 14, 2019
```
Former-commit-id: 8c87dcdb11f1d1c1bdc5c240369b1e7d1ed95cef
```
  ce6bd95b
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · d3f5cf3c
  由 peng.xu 提交于 8月 14, 2019
```
default grpc

See merge request megasearch/milvus!344

Former-commit-id: 226ea82056583dda7d9defcf27e3304f5c58f025
```
  d3f5cf3c
- G
  default grpc · b3b39b28
  由 groot 提交于 8月 14, 2019
```
Former-commit-id: 9147d37d4484996199f2374def5388f139b020d0
```
  b3b39b28
13 8月, 2019 28 次提交
- J
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 96aab1eb
  由 jinhai 提交于 8月 13, 2019
```
MS-348 Add ResourceFactory Test

See merge request megasearch/milvus!343

Former-commit-id: 8e7e63b2015b3aa94f020b368b901be45815c420
```
  96aab1eb
- W
  MS-348 Add ResourceFactory Test · ba276430
  由 wxyu 提交于 8月 13, 2019
```
Former-commit-id: 19a40353320c2059090441120f93108ee89f1fc1
```
  ba276430
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 80fc6d3b
  由 peng.xu 提交于 8月 13, 2019
```
clean code

See merge request megasearch/milvus!342

Former-commit-id: 5019c2b1128269576d116750291387743ae6894a
```
  80fc6d3b
- P
  Merge branch 'fix_MS-303' into 'branch-0.4.0' · 2896db53
  由 peng.xu 提交于 8月 13, 2019
```
fix MS-303

Closes MS-303

See merge request megasearch/milvus!341

Former-commit-id: 5667d594b565b19063f8d24ab8576c459a249180
```
  2896db53
- G
  clean code · add9f9ec
  由 groot 提交于 8月 13, 2019
```
Former-commit-id: e283d5da7a6d24f4d0cda3eed6f5620f779a889f
```
  add9f9ec
- X
  fix · 5357780c
  由 xj.lin 提交于 8月 13, 2019
```
Former-commit-id: fb46b737cdd349ca127d5bfb047eaf168209f289
```
  5357780c
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 031561d8
  由 peng.xu 提交于 8月 13, 2019
```
MS-346 add .cpp to solve compile error

See merge request megasearch/milvus!340

Former-commit-id: a377e3d4de53eda8f5e47a425a38c92ce87c81fa
```
  031561d8
- W
  MS-346 add .cpp to solve compile error · 92a504c2
  由 wxyu 提交于 8月 13, 2019
```
Former-commit-id: e1783830d9dc04a349388d047479cbe0f3bcebee
```
  92a504c2
- J
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · a51cac94
  由 jinhai 提交于 8月 13, 2019
```
MS-345 Add Node Test

See merge request megasearch/milvus!338

Former-commit-id: eebe95282f31d3896da9182c8feaadf9f8ff6c88
```
  a51cac94
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · cb4ba39f
  由 peng.xu 提交于 8月 13, 2019
```
rename milvus_grpc_server to milvus_server

See merge request megasearch/milvus!339

Former-commit-id: d009d4e42919673f5a2db49aa9751631e878c6cc
```
  cb4ba39f
- Y
  Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0 · 81d65354
  由 Yu Kun 提交于 8月 13, 2019
```
Former-commit-id: b0fa829bd9cf08ec6c50b3d9973aed12311c97f9
```
  81d65354
- Y
  rename milvus_grpc_server to milvus_server · 5806b7ee
  由 Yu Kun 提交于 8月 13, 2019
```
Former-commit-id: 868f79fb2f62db94f6b5898b19325ae06e5ac2fb
```
  5806b7ee
- W
  Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0 · 2e045ce6
  由 wxyu 提交于 8月 13, 2019
```
Former-commit-id: 9201a7f256fca66406ee583dbc33fbf423204f21
```
  2e045ce6
- W
  MS-345 Add Node Test · 3bfc55d9
  由 wxyu 提交于 8月 13, 2019
```
Former-commit-id: f1faca80621acbdb820035529dcd2b682cb345ce
```
  3bfc55d9
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 760b4951
  由 peng.xu 提交于 8月 13, 2019
```
MS-344 Add TaskTable Test

See merge request megasearch/milvus!334

Former-commit-id: ab99a322dad82e8505b521962ce99f159e66b305
```
  760b4951
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 7c60c0b5
  由 peng.xu 提交于 8月 13, 2019
```
avoid jenkins break build

See merge request megasearch/milvus!337

Former-commit-id: 8d7d1940c81529ac5eae4efcb034db9f9ff8e9d8
```
  7c60c0b5
- G
  avoid jenkins break build · d5696b4d
  由 groot 提交于 8月 13, 2019
```
Former-commit-id: 368aeac29fd81917b9fd585d731e837c895bc742
```
  d5696b4d
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 468120bb
  由 peng.xu 提交于 8月 13, 2019
```
add new interface definition and move milvus_server to milvus_grpc_server

See merge request megasearch/milvus!335

Former-commit-id: 4cfb155aff68852ca68cbc11dda129749d5bed20
```
  468120bb
- Y
  merge upstream/branch-0.4.0 · f4f78a3e
  由 Yu Kun 提交于 8月 13, 2019
```
Former-commit-id: 9d1972ab35b36009a2df06fbfdb664a747e9396a
```
  f4f78a3e
- Y
  Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0 · 8fe0a86f
  由 Yu Kun 提交于 8月 13, 2019
```
Former-commit-id: 44955f7319f9ef0c3385d67dd5a88f38271e6487
```
  8fe0a86f
- Y
  add new interface definition · 56885253
  由 Yu Kun 提交于 8月 13, 2019
```
Former-commit-id: ca855d7705452a546df73e50626156931d2c4db3
```
  56885253
- W
  MS-344 Add TaskTable Test · 4146a73d
  由 wxyu 提交于 8月 13, 2019
```
Former-commit-id: 47aee024d78b3a45c29b179a2949bfc8b37750e1
```
  4146a73d
- P
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 2cf61605
  由 peng.xu 提交于 8月 13, 2019
```
MS-343 Implement ResourceMgr

See merge request megasearch/milvus!333

Former-commit-id: 16ed40c87e7519cbd3da2f94e1565f68ebd32bb6
```
  2cf61605
- G
  MS-343 implement ResourceMgr · b7656487
  由 groot 提交于 8月 13, 2019
```
Former-commit-id: dce8588474e29e3da9fa68189306cee58a570c2b
```
  b7656487
- G
  MS-343 implement ResourceMgr · c6ebf5c8
  由 groot 提交于 8月 13, 2019
```
Former-commit-id: 4ff53b6f2a56aa798344bcf807afe7ea7c63f0dc
```
  c6ebf5c8
- J
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 887c2c4f
  由 jinhai 提交于 8月 13, 2019
```
MS-336 scheduler interface

See merge request megasearch/milvus!332

Former-commit-id: 47f143b78d0e6b3ff9af768d56872aafbf822df8
```
  887c2c4f
- W
  MS-336 scheduler interface · 35989d1c
  由 wxyu 提交于 8月 13, 2019
```
Former-commit-id: 413560a49cd39430cc2bf23ffa6d833af37bd436
```
  35989d1c
- W
  MS-336 scheduler interface · a45dae3b
  由 wxyu 提交于 8月 13, 2019
```
Former-commit-id: df7b25225e299d2bdd9eb26517f5b17982250879
```
  a45dae3b
12 8月, 2019 3 次提交
- J
  Merge branch 'branch-0.3.1' into branch-0.4.0 · d340a855
  由 jinhai 提交于 8月 12, 2019
```
Former-commit-id: e17b77bd31bc3920df8d61fb428a2ab4de2230fc
```
  d340a855
- J
  Merge branch 'branch-0.3.1' into 'branch-0.3.1' · 9ca260e2
  由 jinhai 提交于 8月 12, 2019
```
MS-330 Stability test failed caused by server core dumped

See merge request megasearch/milvus!331

Former-commit-id: 257de96e7e82e47656b2b6aec1d885a86d7a648c
```
  9ca260e2
- G
  MS-330 Stability test failed caused by server core dumped · fd27b455
  由 groot 提交于 8月 12, 2019
```
Former-commit-id: 8f6671473b52fb661c1020cb74642324f486eff8
```
  fd27b455
09 8月, 2019 4 次提交

Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 66fb3e20

由 jinhai 提交于 8月 09, 2019

modify build.sh to make thrift on

See merge request megasearch/milvus!330

Former-commit-id: fef81a57d635804d7d324fad887679913820fd67

66fb3e20

Y
modify build.sh to make thrift on · 563f6d93
由 Yu Kun 提交于 8月 09, 2019
```
Former-commit-id: 692cf53e238e5aa7c0df1cc9938fb112181dc558
```
563f6d93

Merge branch 'branch-0.3.1' into 'branch-0.3.1' · 70439a5f

由 jinhai 提交于 8月 09, 2019

MS-330 Stability test failed caused by server core dumped

See merge request megasearch/milvus!329

Former-commit-id: caee131fa1f6eec6e7085628772b643a3354ebd7

70439a5f

G
MS-330 Stability test failed caused by server core dumped · bcc0338b
由 groot 提交于 8月 09, 2019
```
Former-commit-id: 6b7b36817c5dce1fd5e9d4979cff306ceef7fd17
```
bcc0338b

BaiXuePrincess / milvus 与 Fork 源项目一致

BaiXuePrincess / milvus
与 Fork 源项目一致