Commit Graph

2946 Commits (63fbc43fbc53d624cc2843109cca1f56abd957ee)

Author SHA1 Message Date
starlord 2a2a070c95 fix build error
Former-commit-id: 9b595c80931e17acf676f03e1f3b4cdcc9a40b94
2019-09-26 20:36:58 +08:00
starlord 5b0a13bf07 fix build error
Former-commit-id: 3416c37d548be2e04dc2814830d935baab5104cb
2019-09-26 20:34:31 +08:00
starlord 2b132a9cef format server code
Former-commit-id: 5502293863810d216a6c8c46a28eb76bfa30bd12
2019-09-26 20:25:57 +08:00
starlord 3d51d69555 format utils code
Former-commit-id: aa281f8473100587c93afe7caf001ce640fbcc2d
2019-09-26 19:58:25 +08:00
peng.xu 20f7bc3395 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
Branch 0.5.0

See merge request 

Former-commit-id: 84feb749a1405471c5f7421e5582df3140dbd613
2019-09-26 19:13:51 +08:00
starlord 27e7850bdf format code
Former-commit-id: b60db90436cc9d8de9fd86d721ffb48d3041da73
2019-09-26 19:13:12 +08:00
peng.xu ff644703bb Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-574 Milvus configuration refactor

See merge request 

Former-commit-id: c489f31e297ce57d3bfe995ce734bb0da546d972
2019-09-26 19:08:36 +08:00
yudong.cai d9b6fd0575 MS-574 rename config deploy_mode
Former-commit-id: b3f2c2cc539c3cd7419c091b6eaf17df0a57f0eb
2019-09-26 19:05:09 +08:00
starlord d5a825edfd format config code
Former-commit-id: 6d87e0d669e5f8029453a94cc1817372263ff30f
2019-09-26 18:59:01 +08:00
peng.xu fb9b13d0b8 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
format wrapper code

See merge request 

Former-commit-id: e78e3a82f0d34a9d949f1c25a9fac0a622a38ed6
2019-09-26 18:54:48 +08:00
starlord 4c91d328b1 format wrapper code
Former-commit-id: 04af0f6d6e66d1fdcd01fc8de0cf93000793d5db
2019-09-26 18:53:50 +08:00
yudong.cai d0b888c012 MS-574 refine configuration names
Former-commit-id: c8f29009c5dc6712a0fd67185e24d4f9ce1286d1
2019-09-26 18:49:32 +08:00
peng.xu 4b10cb3ec0 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-587 Count get wrong result after adding vectors and index built immediately

See merge request 

Former-commit-id: b086ba967fc165e4f6d7ee2c5e57d933ccb8a2ee
2019-09-26 17:13:03 +08:00
starlord 073a987d79 MS-587 Count get wrong result after adding vectors and index built immediately
Former-commit-id: 8e46b545f10a230f1f74c9529c23aabf2af56b40
2019-09-26 17:08:18 +08:00
xiaojun.lin aff9491824 Merge branch 'branch-0.5.0' into refactor_knowhere
Former-commit-id: 005c77538d7c2d0b52015a748a04da6d171d0f3d
2019-09-26 17:05:07 +08:00
xiaojun.lin d78d032b82 MS-565 remove jsoncons v1
Former-commit-id: cedf253075a00eb4a7d999ffcceb90f8fa795f2e
2019-09-26 17:03:46 +08:00
peng.xu 33c169be8c Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-592 Change showtables stream transport to unary

See merge request 

Former-commit-id: 15d98768d614ce07d85c44b40dc7cef88b685034
2019-09-26 15:16:29 +08:00
peng.xu 4fe32aedc9 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
fix ci issue

See merge request 

Former-commit-id: 89a78e5c4bf3abb4ec2efba0b7d65dea72126462
2019-09-26 15:13:15 +08:00
starlord 9e4e60f570 fix ci issue
Former-commit-id: 02a03f10641926de5f466449d738700fb22652ed
2019-09-26 15:12:23 +08:00
Yu Kun 3ed012660a fix conflicts
Former-commit-id: b76eb04b7a5490d6ac28024f0367580b4fbb7e8a
2019-09-26 15:11:48 +08:00
Yu Kun 5e0e22385c MS-592 Change showtables stream transport to unary
Former-commit-id: b5746069867c3c647a00623f0e36b01c7fc4eb19
2019-09-26 15:01:42 +08:00
peng.xu 49b46d21ff Merge branch 'Refactor_Knowhere' into 'branch-0.5.0'
MS-579 Server log format: need add month/day in void of the same log name

See merge request 

Former-commit-id: cceac0c6463636868d845f11a25f5f885cb72728
2019-09-26 13:02:41 +08:00
peng.xu 3ead2274aa Merge branch 'branch-0.5.0' into 'branch-0.5.0'
fix unittest build error

See merge request 

Former-commit-id: 94d59f8b59da542d692b8523a96f6a17fe1ce4fe
2019-09-26 13:02:34 +08:00
starlord 9eb1ebc677 fix unittest build error
Former-commit-id: 2bacb09b54ef6e84a9594de5064dc87461d215fc
2019-09-26 12:23:47 +08:00
Heisenberg 99f0602009 MS-579 change Server log format
Former-commit-id: 176378dd8e45401e014e7594e2c4dd23c9268cdc
2019-09-26 12:04:27 +08:00
Heisenberg 48023fbde0 MS-579 Server log format: need add month/day in void of the same log name
Former-commit-id: 601dc7c3f8d87bae181a3c30eda0bb3b1853e0a3
2019-09-26 11:54:11 +08:00
Yu Kun 786e9c5adc MS-592 Change showtables stream transport to unary
Former-commit-id: c094aa407179fc9b5aea81fdda3fe849d7564bda
2019-09-26 11:43:45 +08:00
peng.xu c7111d1b02 Merge branch 'Refactor_Knowhere' into 'branch-0.5.0'
MS-591 Rename source files in wrapper

See merge request 

Former-commit-id: e1d347d4e807d3b66a7216b67e473dc968a525fe
2019-09-26 11:36:38 +08:00
Heisenberg e1cfb6cc06 MS-591 Rename source files in wrapper
Former-commit-id: 1b864ef00ccdc0e524c2cf7cceb97428171077f8
2019-09-26 11:27:27 +08:00
quicksilver cf3798dd55 add cmake format python file
Former-commit-id: f64a840c533e0d19c2ef912175adaecd140298d1
2019-09-26 11:19:39 +08:00
peng.xu d5a3324e58 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
Update CODE OF CONDUCT.md

See merge request 

Former-commit-id: f3a191d6e1ac0bd80d47f979ed691d10a0aac55a
2019-09-26 11:06:52 +08:00
jielin.xu 4685869bd3 Update CODE OF CONDUCT.md
Former-commit-id: fec111fd18e6c31e8583b9f8af383a281f729bc3
2019-09-26 11:05:59 +08:00
peng.xu dc9d0a646c Merge branch 'branch-0.5.0' into 'branch-0.5.0'
cpplint setting

See merge request 

Former-commit-id: 75ac3254ed156ebe7f0a756a3b29f98115bb5fc7
2019-09-26 11:03:01 +08:00
starlord 274babb379 Merge branch 'branch-0.5.0' of 192.168.1.105:groot/vecwise_engine into branch-0.5.0
Former-commit-id: b2b99791984af806c6127802ac55ff7c6b71516e
2019-09-26 11:01:39 +08:00
starlord 45dccb91c7 Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0
Former-commit-id: 0f7f16a2227b3fa4ceaf8d331c89edec2526ac38
2019-09-26 11:01:32 +08:00
starlord 5ffaa4fd0a excluse some files
Former-commit-id: 9348aa652665488621be0dac17a26ad9198d2db1
2019-09-26 11:01:21 +08:00
quicksilver 731d5402b2 add cmake format python file
Former-commit-id: 073fb9af2e0d2e4ea64de620cbcc2852e9fe83ee
2019-09-26 10:50:27 +08:00
quicksilver e3929b0d40 add .clang-tidy-ignore
Former-commit-id: a641dba1d299c58e28dd61ac6920ead28c2d5ed6
2019-09-26 10:42:26 +08:00
quicksilver a392e03e85 add .clang-tidy
Former-commit-id: 16e15b04d447624f1ca140be6f9b9d066aaa64cf
2019-09-26 10:39:10 +08:00
starlord 7368c7b3bc Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0
Former-commit-id: 3a1a63827148ab001f301680e940fd0ac4f60577
2019-09-26 10:27:22 +08:00
starlord a8f6e5dc6f Merge branch 'branch-0.5.0' of 192.168.1.105:groot/vecwise_engine into branch-0.5.0
Former-commit-id: e6cb8e7f07401b049569638f1e0aee514bacb001
2019-09-26 10:27:06 +08:00
peng.xu 64e3cc01eb Merge branch 'caiyd_refactor_config_1' into 'branch-0.5.0'
MS-574 Milvus configuration refactor

See merge request 

Former-commit-id: 9d0f05589f4344bb029c2f65470d9b567999ae3f
2019-09-26 10:19:32 +08:00
starlord cf02b1d2c1 Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0
Former-commit-id: c272755bcd7051551a2721818f3ced3994c466ae
2019-09-26 10:16:27 +08:00
starlord 607bd33b08 excluse some files
Former-commit-id: 5b1b5b4c5d31d2915573c26d8438f7382cabbeca
2019-09-26 10:16:14 +08:00
peng.xu 3b67f0976c Merge branch 'branch-0.5.0' into 'branch-0.5.0'
Update CONTRIBUTING.md

See merge request 

Former-commit-id: d2b4ff06ad0faf2c6a4385927726ad1a82054da2
2019-09-26 10:06:54 +08:00
jielin.xu f2f7919123 Update CONTRIBUTING.md
Former-commit-id: 1b8f814d6d8d9d512333ef51235e2d5b9726d1e5
2019-09-26 10:05:16 +08:00
peng.xu f4af69c19e Merge branch 'branch-0.5.0' into 'branch-0.5.0'
Branch 0.5.0

See merge request 

Former-commit-id: 8d9968034b0704626f3d9084562ed92be9f3aa00
2019-09-26 10:00:33 +08:00
quicksilver 6a9643f805 add .clang-format
Former-commit-id: 30309723f212f9eca5b37146db24d7bde117b3af
2019-09-25 20:27:53 +08:00
starlord 681fbe50a2 excluse some files
Former-commit-id: 4c8381a632dbcbbe3fe7888e3ecef8caad402477
2019-09-25 20:14:55 +08:00
yudong.cai 44b539728c Merge branch 'branch-0.5.0' into caiyd_refactor_config_1
Former-commit-id: 28ba312753b541b8fde198345943f974cfb6a452
2019-09-25 20:09:40 +08:00