Commit Graph

2661 Commits (45dccb91c7520616eb2b7583a5ee7b23af9ff73e)

Author SHA1 Message Date
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 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 megasearch/milvus!610

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 megasearch/milvus!611

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 megasearch/milvus!607

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
quicksilver cf8f8ef3ca Merge branch 'branch-0.5.0' of http://192.168.1.105:6060/megasearch/milvus into branch-0.5.0
Former-commit-id: 1795955f36c11646fb1e7299e4842b2dc489b31e
2019-09-25 19:54:35 +08:00
quicksilver e7a6cff566 add JFROG_ARTFACTORY_URL parameter in CMakeLists.txt
Former-commit-id: 20150e9cabff924b2fc83757a0faee14e26998d4
2019-09-25 19:54:30 +08:00
yudong.cai 91daaf7e7e MS-574 add config set APIs
Former-commit-id: e5465a07270b4ffbdf9dcacfd9912ecfb88c528c
2019-09-25 19:49:22 +08:00
peng.xu 0339ebcc74 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
modify readme

See merge request megasearch/milvus!609

Former-commit-id: e04e676827a0298c1f675eab63695d93f5086c5d
2019-09-25 19:33:04 +08:00
starlord 2c152e6755 Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0
Former-commit-id: c3393c1eef783828866a298e7f13902fd99c599e
2019-09-25 19:25:14 +08:00
starlord 2e26d28a12 MS-590 Refine cmake code to support cpplint
Former-commit-id: 352431bc44645574c96d28b5c46966ed85a69288
2019-09-25 19:24:37 +08:00
yudong.cai ee7fb3684a MS-574 add config check
Former-commit-id: ac1ed68cc7fcd08cde02bccbd574ac34fdbfdb97
2019-09-25 19:16:12 +08:00
peng.xu b4d0e87bce Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-590 Refine cmake code to support cpplint

See merge request megasearch/milvus!608

Former-commit-id: 9d8a9837966eef9c749aeaf93ba201a4e7826736
2019-09-25 19:15:40 +08:00
starlord 45c56900c7 Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0
Former-commit-id: 01c1d9b135328b2e1468277fd433eeb3d31b3318
2019-09-25 19:05:31 +08:00
starlord 455a31c8bc MS-590 Refine cmake code to support cpplint
Former-commit-id: 583d31a79b3b491c3c3bf7eda9fa613d1c6a58ff
2019-09-25 19:05:08 +08:00
quicksilver 964ee0013d add JFROG parameter
Former-commit-id: 13493ae141c2ba1081b6e4c4eb5f9aa49a4b03ee
2019-09-25 17:42:21 +08:00
quicksilver e9307c3c24 add JFROG_USER parameter
Former-commit-id: 7bb920f6efc3f33649f0766b34e1878872c75039
2019-09-25 17:30:14 +08:00
quicksilver 0f287c3910 format CMakeLists.txt
Former-commit-id: b1980e2e8fda99a49d9bd005ce0caf0ef494ca02
2019-09-25 16:32:48 +08:00
yudong.cai 0d0d08c256 MS-574 let all config APIs return Status
Former-commit-id: 7a843fa57779637761a80def4705a37f9805ceaf
2019-09-25 16:16:08 +08:00
jielin.xu dc273ae4ac Update CONTRIBUTING.md
Former-commit-id: 1d9bda6fbbe40be5562dd6f6d03910c5ab5fc5f6
2019-09-25 16:09:18 +08:00
jielin.xu f10b7ed8b0 Update CONTRIBUTING.md
Former-commit-id: c00ea6cb77a7fa35c2ccc864226af5fbb18a64ea
2019-09-25 15:18:23 +08:00
quicksilver 41a2cc3432 format CMakeLists.txt
Former-commit-id: 281e0bcb78233f6570c426fab6f9a4a067adf790
2019-09-25 15:17:06 +08:00
jielin.xu 84f77debca Update CONTRIBUTING.md
Former-commit-id: a8c9caa337275e27efc7f9ba38486942b1b76792
2019-09-25 15:09:06 +08:00
jielin.xu 0339a93aed Update CONTRIBUTING.md
Former-commit-id: 1cd9de3f3556277bd9c798a2a6eec16ff5dbc921
2019-09-25 15:08:29 +08:00
quicksilver 34a5e23f36 Merge branch 'branch-0.5.0' of http://192.168.1.105:6060/megasearch/milvus into branch-0.5.0
Former-commit-id: 2e80e61b46c0f3b926eee5676ab38f77514a26f1
2019-09-25 15:04:49 +08:00
quicksilver 5c4889dd25 format CMakeLists.txt
Former-commit-id: 447d58d1b8d0a065f2c5c5ec7b7aa3b57babe8b3
2019-09-25 15:04:42 +08:00
jielin.xu f1c40f4440 Update README.md
Former-commit-id: f418eaa3b6a769e6f07552a21e2f947d845f7851
2019-09-25 14:56:38 +08:00
jielin.xu 30925f759b Update README.md
Former-commit-id: 0ca186c1fd21c7dadcf6f892a210e9d3b8925696
2019-09-25 14:37:26 +08:00
jielin.xu 1f99ab1c7a Update README.md
Former-commit-id: 41bfed06d0b2ee0970e99873f22e008780988f30
2019-09-25 14:33:36 +08:00
jielin.xu 8a53d8c9f1 Update README.md
Former-commit-id: 16c10a07a3d4632b4419174882b0d7cd7b75fa4e
2019-09-25 14:33:16 +08:00
peng.xu 7761fd9d12 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
fix build error

See merge request megasearch/milvus!606

Former-commit-id: 783ef8d01b5201183a79e74006927d67649c4e79
2019-09-25 14:16:19 +08:00
jielin.xu 66403b6591 Update README.md
Former-commit-id: 8b2c69babf81423bc4f09cf67f5b8198d7551633
2019-09-25 14:15:26 +08:00
starlord be2abf935c fix build error
Former-commit-id: f094a9ad816accc2b6fc96e2c515e554d9ce8f14
2019-09-25 14:15:26 +08:00
peng.xu c0682a1ccf Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-582 grafana displays changes frequently

See merge request megasearch/milvus!604

Former-commit-id: c9606a8d2f56227bbc590e32ea504f557b587f80
2019-09-25 11:56:56 +08:00
Yu Kun 4a1b0fa261 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0
Former-commit-id: 7713ece20e698cee8e07229f9fb9fc869bb066c4
2019-09-25 11:55:31 +08:00
peng.xu 644610f23c Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-586 Remove BUILD_FAISS_WITH_MKL option

See merge request megasearch/milvus!605

Former-commit-id: 77dd3bfed2e040b73335c565e6d3b9c7ed703e63
2019-09-25 11:44:16 +08:00
starlord f195bd7d33 remove unused option
Former-commit-id: 2594078698d7e570d40f0e72a8f868e1d5a0bd2d
2019-09-25 11:42:25 +08:00
starlord 3cbc8b6825 MS-586 Remove BUILD_FAISS_WITH_MKL option
Former-commit-id: 22f4383828bc1e975c7b21e8ee6a64936039e41b
2019-09-25 10:50:33 +08:00
Yu Kun a0cca6ebe7 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0
Former-commit-id: 0c2a2277095e14a4216a16f214f98408064fdb4d
2019-09-21 19:16:24 +08:00
Yu Kun d470889d4e MS-582 grafana displays changes frequently
Former-commit-id: 9e2771a4ea84cf8b868628ce64cf0b0ad48a200d
2019-09-21 19:16:15 +08:00