提交 · 5357780cf953678e570ecc0a3d6affa0d4e43697 · BaiXuePrincess / milvus

13 8月, 2019 15 次提交

fix · 5357780c

由 xj.lin 提交于 8月 13, 2019


Former-commit-id: fb46b737cdd349ca127d5bfb047eaf168209f289

5357780c

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

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

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

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

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 17 次提交

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

Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 52b9c7c6

由 Jeff 提交于 8月 09, 2019

update build.sh

See merge request megasearch/milvus!328

Former-commit-id: 28d2101e5a0dfd099cab95303aa6fcb9cdcbebf0

52b9c7c6

Q
update build.sh · 6e16a387
由 quicksilver 提交于 8月 09, 2019
```
Former-commit-id: 8c085b61f7aff046eacccd1e6960c67bb25b95f2
```
6e16a387

Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 208f4d8b

由 jinhai 提交于 8月 09, 2019

grpc and thrift server run concurrently

See merge request megasearch/milvus!327

Former-commit-id: fca6ff245b7873689288d74e28e97080aa739de9

208f4d8b

Y
modify start_server.sh · 9634b3a5
由 Yu Kun 提交于 8月 09, 2019
```
Former-commit-id: c6280041e6a9b64972b7ba781d3795a6ea0b550e
```
9634b3a5
Y
merge upstream and fix bug · ca4ad5f4
由 Yu Kun 提交于 8月 09, 2019
```
Former-commit-id: c60615ee55cfcab25a2182c0428f09384b49daaf
```
ca4ad5f4
Y
Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0 · b629522b
由 Yu Kun 提交于 8月 09, 2019
```
Former-commit-id: 88de15d423732e02257e413be920fff01f7831aa
```
b629522b
Y
grpc and thrift server run concurrently · 004546f1
由 Yu Kun 提交于 8月 09, 2019
```
Former-commit-id: 6334b6a91361ff67a51e0bd42ceb69dbfea79840
```
004546f1

Merge branch 'branch-0.3.1' into 'branch-0.3.1' · e53bdc7c

由 jinhai 提交于 8月 09, 2019

handle exception in merge file

See merge request megasearch/milvus!326

Former-commit-id: 208324b045935f2b2b9200e740a43cebb0cb24a4

e53bdc7c

G
handle exception in merge file · b1f6e7e8
由 groot 提交于 8月 09, 2019
```
Former-commit-id: 687e64645af47e42f030a456a0c7c9921748198e
```
b1f6e7e8

Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 11cf10e6

由 Jeff 提交于 8月 09, 2019

MS-306 - Optimize build efficiency

See merge request megasearch/milvus!325

Former-commit-id: dc1ae407f8a10b7605c1e4cc1e043bf54dff62a1

11cf10e6

Q
update grpc md5 · 8f4f1367
由 quicksilver 提交于 8月 09, 2019
```
Former-commit-id: 29fa0ea8544c442e07f77baf6d4c72aa48c21436
```
8f4f1367

Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 6f00734d

由 Jeff 提交于 8月 09, 2019

MS-306 - Optimize build efficiency

See merge request megasearch/milvus!324

Former-commit-id: 2698035f553a1f1075122ecf8c4a69fa330b7bfb

6f00734d

Q
add grpc cache · 7263ad71
由 quicksilver 提交于 8月 09, 2019
```
Former-commit-id: 803420b13892f674a92ce5df0ee827dfd3aad95d
```
7263ad71

08 8月, 2019 5 次提交
- J
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 7db8d10f
  由 Jeff 提交于 8月 08, 2019
```
MS-306 - Optimize build efficiency

See merge request megasearch/milvus!323

Former-commit-id: f735dd1c1a5b6e9c66bf696444a8e943effb7518
```
  7db8d10f
- Q
  update cpp/cmake/BuildUtils.cmake · 02a86c48
  由 quicksilver 提交于 8月 08, 2019
```
Former-commit-id: 160bf11f3da73b38098b2d9e053ca69d7d319274
```
  02a86c48
- J
  Merge branch 'branch-0.4.0' into 'branch-0.4.0' · 66473f8e
  由 jinhai 提交于 8月 08, 2019
```
add back knowhere

See merge request megasearch/milvus!322

Former-commit-id: f247a9710d8574268296b2825199c7411b84cf9e
```
  66473f8e
- Y
  add knowhere submodule back · ba9edee1
  由 Yu Kun 提交于 8月 08, 2019
```
Former-commit-id: 1839a54b7cbcdac5229e50a0303019c056a0912f
```
  ba9edee1
- Y
  add knowhere submodule back · 828174b6
  由 Yu Kun 提交于 8月 08, 2019
```
Former-commit-id: 737f631650928f1789079af21fa002f7f2857e52
```
  828174b6

BaiXuePrincess / milvus 与 Fork 源项目一致

BaiXuePrincess / milvus
与 Fork 源项目一致