Commit Graph

1246 Commits (eaca1381ee4f07cc8d743a9f8c1029c3580691a5)

Author SHA1 Message Date
peng.xu eaca1381ee Merge branch 'be_stable' into 'branch-0.3.1-xiaojun'
MS-240 add Log

See merge request megasearch/milvus!228

Former-commit-id: cdb0b9095df2586342301ee3675808fe322e6174
2019-07-17 10:55:16 +08:00
xj.lin 4948e47b67 MS-240 add Log
Former-commit-id: 0f779db21c49adb3d09b1868ac2ee8de00d35bd0
2019-07-17 10:54:04 +08:00
peng.xu f3c481dd4f Merge branch 'be_stable' into 'branch-0.3.1-xiaojun'
Be stable

See merge request megasearch/milvus!226

Former-commit-id: 54f4aba3c250a2c715f61028c73b965fad9986d7
2019-07-16 15:27:05 +08:00
xj.lin d332dadf9b add some log
Former-commit-id: c5432276b5ade9bb1dce687ea1cfe04840078cbb
2019-07-16 15:25:33 +08:00
starlord 46dbce34ad avoid background merge thread stop
Former-commit-id: cc6ff30a93f8f6afdd662b7459dbb0db63ef45d6
2019-07-16 15:17:20 +08:00
Jeff b3596bf8c0 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
add helm stable repo

See merge request megasearch/milvus!191

Former-commit-id: 960e1fe7df0cc53c6caab981d1281332d0c14cd9
2019-07-12 14:26:52 +08:00
quicksilver 0a7288c2e3 add helm stable repo
Former-commit-id: e7958b9d69a0ae9f534e0b2288b92424b398970e
2019-07-12 14:26:16 +08:00
jinhai cde337d7d7 Merge branch 'add_unittest' into 'branch-0.3.1'
Add unittest

See merge request megasearch/milvus!187

Former-commit-id: 71dc3989453309a9b25174ce02bf90096ba5c253
2019-07-10 20:32:48 +08:00
xj.lin 52e5d1ab22 Merge remote-tracking branch 'upstream/branch-0.3.1' into add_unittest
Former-commit-id: d04bb0a9d96caa9ef2e1fe5cc9c01c2e464699e7
2019-07-10 20:29:40 +08:00
xj.lin ad82f4bd7b add test-bin
Former-commit-id: 920180954eeba02697bc61e9c9b69a13629b0e90
2019-07-10 20:28:16 +08:00
Jeff b356de64e9 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
Branch 0.3.1

See merge request megasearch/milvus!186

Former-commit-id: 8b4384e2b40daef47bbd43affc8547e86c3d6641
2019-07-10 17:55:27 +08:00
quicksilver 027ee4ea93 MS-202 - Add Milvus Jenkins project email notification
Former-commit-id: 951c5314c90dced332c32254c44d4eefef4adb9a
2019-07-10 17:54:47 +08:00
quicksilver e3ec2ac26a send email on master node
Former-commit-id: 2fab82c23cfd1a93e1df61686f54f11352a2c463
2019-07-10 17:50:22 +08:00
quicksilver 7cabf0f1ea send email on master node
Former-commit-id: b363e112ef2fcd06de24cd203b366696371d80a4
2019-07-10 17:46:29 +08:00
quicksilver b4abf92d54 send email on master node
Former-commit-id: 07518d892cb27efe82ac4d181594a31a67795e79
2019-07-10 17:43:08 +08:00
quicksilver 72ffedebd7 add email notify function
Former-commit-id: b5813c2a1916b72aa23f2026d95fd1023d5406a7
2019-07-10 17:14:28 +08:00
peng.xu b7966df1f1 Merge branch 'add_unittest' into 'branch-0.3.1'
Add unittest

See merge request megasearch/milvus!185

Former-commit-id: fe37fe22833770f07ccf552364e3e7e31659232c
2019-07-10 16:49:16 +08:00
xj.lin 85e8a2b12b fix unittest
Former-commit-id: 92e8d283ff8170584f62db8b94f604a8bb094281
2019-07-10 16:48:09 +08:00
xj.lin db0d165d4c Merge remote-tracking branch 'upstream/branch-0.3.1' into add_unittest
Former-commit-id: 0acb19fcd6f098eb9902bbc4b204c9187343405f
2019-07-10 16:29:51 +08:00
xj.lin c6ce5772ba fix bad alloc and add idmap
Former-commit-id: bd2686574ad9010e33dcf34f3ae45308d5b3c971
2019-07-10 16:28:11 +08:00
peng.xu c6ccf78e35 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
fix server test

See merge request megasearch/milvus!184

Former-commit-id: 5be0048119bbba154eb25c306b210a6ab20d984b
2019-07-10 14:55:22 +08:00
starlord 739744569c fix server test
Former-commit-id: 9f3f0b98fb27392407ad0319608034a89a918b33
2019-07-10 14:54:19 +08:00
jinhai 59cf5d8e65 Merge branch 'mem-0.3.1' into 'branch-0.3.1'
MS-190: use env variable to switch mem manager and fix cmake

See merge request megasearch/milvus!180

Former-commit-id: a839cb38ff916da6b197c40185457e7537549a17
2019-07-10 13:11:07 +08:00
zhiru 81ab29ed88 update
Former-commit-id: 64463e2d9609f85f1347c39a3b42eba880f35565
2019-07-09 21:15:54 +08:00
zhiru 143a172ae8 update
Former-commit-id: 1575fe6ead3c09caf0d5d3fa764ceb461431ab5e
2019-07-09 21:13:55 +08:00
zhiru f57ffefa36 update
Former-commit-id: c4bd8a4f4c714ad54999e8c7471b1c6179427b62
2019-07-09 21:11:05 +08:00
peng.xu fa4a2caead Merge branch 'mem-0.3.1' into 'branch-0.3.1'
MS-190:  use env variable to switch mem manager and fix cmake

See merge request megasearch/milvus!176

Former-commit-id: 27f889cd658c55c9b3c13266dfd5a9319e8d5398
2019-07-09 17:33:41 +08:00
zhiru df26e649cd update
Former-commit-id: 632e7b8205196c234eb85dca72c59f52db82979f
2019-07-09 17:32:05 +08:00
zhiru 2f6799e53b fix cmake
Former-commit-id: bcbf6776c264b9aa59de049201249acff7c8c37e
2019-07-09 17:31:02 +08:00
peng.xu 4fe9622be9 Merge branch 'mem-0.3.1' into 'branch-0.3.1'
MS-190: use env variable to switch mem manager and fix cmake

See merge request megasearch/milvus!175

Former-commit-id: 26d63603dd11728d3d3507eb9d12ddf0b88bf28c
2019-07-09 17:17:31 +08:00
zhiru d13b244a46 use env variable to switch mem manager and fix cmake
Former-commit-id: 7928c6384045f002fd4bf4367bcf5ab9b5262ac0
2019-07-09 17:15:21 +08:00
zhiru a569f60407 use env variable to switch mem manager and fix cmake
Former-commit-id: adf9686013de429b842e1bc30860b5ebbe4cad2a
2019-07-09 17:09:22 +08:00
zhiru a6180ccea5 use env variable to switch mem manager and fix cmake
Former-commit-id: f433a193e4086600d3a0ca2259e1f65f0d7fbc5b
2019-07-09 17:07:52 +08:00
peng.xu ec394371d0 Merge branch 'add_unittest' into 'branch-0.3.1'
add tbb.so

See merge request megasearch/milvus!174

Former-commit-id: 0314953df71ca11ff2b0d23c56fcf306127bfc9b
2019-07-09 15:51:43 +08:00
xj.lin 4502c9e6f6 add tbb.so
Former-commit-id: 44a9d9485d3f6de2006979c81fe092fa179f5515
2019-07-09 15:50:54 +08:00
peng.xu 5f8b357b95 Merge branch 'add_unittest' into 'branch-0.3.1'
fix build error

See merge request megasearch/milvus!173

Former-commit-id: 95331af7478d44bba3fdfc164cef985f9194c738
2019-07-09 15:10:33 +08:00
xj.lin 94824d55f1 fix build error
Former-commit-id: 83a0e40c4f90a435abe93f46b7e7aefa6b1f2e67
2019-07-09 15:09:08 +08:00
Jeff da7f9afffb Merge branch 'branch-0.3.1' into 'branch-0.3.1'
fix nightly_main_jenkinsfile docker version bug

See merge request megasearch/milvus!172

Former-commit-id: bcb77b7d3c08e9a905b472fcab0cddfa81213b23
2019-07-09 15:07:20 +08:00
quicksilver 838b1d776c fix nightly_main_jenkinsfile docker version bug
Former-commit-id: f7937454b11da5f2c1af63ae0ae221ab25eb1e7a
2019-07-09 15:06:26 +08:00
Jeff 3945913b25 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
add nightly_main_jenkinsfile

See merge request megasearch/milvus!171

Former-commit-id: e829c6ad6f1a1f70cf51c4796da1e14948dae771
2019-07-09 14:31:03 +08:00
quicksilver de7b3333be add nightly_main_jenkinsfile
Former-commit-id: 15122904442d76bd2befb5f683a92f3353fca376
2019-07-09 14:30:00 +08:00
Jeff a3e0800ec9 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
configure git global user information

See merge request megasearch/milvus!170

Former-commit-id: 936b50ed4b3b2cd939fec6b521cceb4777a4642c
2019-07-09 13:48:47 +08:00
quicksilver 2c0f2a9459 configure git global user information
Former-commit-id: a9a17182a1fa22411c7a3bf0c7bb0505550cb333
2019-07-09 13:47:25 +08:00
jinhai 520bacac26 Merge branch 'branch-0.3.1' of http://192.168.1.105:6060/megasearch/milvus into branch-0.3.1
Former-commit-id: 37253d7751f724c515ffb145975af562943f2aaa
2019-07-09 04:45:39 +08:00
zhiru 7ddd982da3 update
Former-commit-id: b21bbf134cf07237466575a2ae7afc4420eb33fe
2019-07-09 04:45:15 +08:00
zhiru 18e0881baf Add new mem manager
Former-commit-id: ef46229de4934de34f144502ce6d8551d4ef38db
2019-07-09 04:45:15 +08:00
starlord 5951755fb9 date range check
Former-commit-id: 10d00dd0be0ccabf933684add78a5c93bc6f8bce
2019-07-09 04:44:50 +08:00
jinhai ee03d36691 MS-176 Update table name length
Former-commit-id: 9280bdd9470730803640f75b962737f3e604501f
2019-07-09 04:44:50 +08:00
jinhai 1db5af5dd2 MS-176 Add create table parameter check
Former-commit-id: 99f768f472c297d453310684c13a02edca0ff90a
2019-07-09 04:44:50 +08:00
zhiru 2ab74af667 add mem manager
Former-commit-id: db1cb126fd931f260c7ecf710e6de043ea0ebeb9
2019-07-09 04:44:50 +08:00