Commit Graph

2732 Commits (c181e405e49a65b2990bd0155bc1ee11a6ff47ae)

Author SHA1 Message Date
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
yudong.cai b0fe84cd81 MS-574 save config in map
Former-commit-id: 961dc6749c1b262e489a825cce81586bf27f2c18
2019-09-21 18:14:29 +08:00
yudong.cai ebda6cb4ef MS-574 rename ServerConfig to Config
Former-commit-id: 2b0ef94293017c64a2f17616a3089e7f0cdd6b2b
2019-09-21 16:39:48 +08:00
yudong.cai 22563d83d7 MS-574 add GET config APIs
Former-commit-id: 6011f32d650d26367ab84f4bf8521889881f2629
2019-09-21 15:02:35 +08:00
peng.xu 4b8b55850b Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-585 Update namespace in scheduler

See merge request megasearch/milvus!603

Former-commit-id: 9ac2759a2296abefea04dbf3c32e19974288f328
2019-09-21 11:29:59 +08:00
wxyu d64389c7e3 MS-585 Update namespace in scheduler
Former-commit-id: 073ab3c91a97415efcb7d3be516a6bc00ee07a7a
2019-09-21 11:29:04 +08:00
jinhai 618229bf19 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
refine code

See merge request megasearch/milvus!602

Former-commit-id: f46d1452032e5f994cfd7caa071620895fcbdeac
2019-09-20 19:30:02 +08:00
starlord 1b4ce04c08 refine code
Former-commit-id: 8e2af64ed8fe7517069944eed3545d13398a3ed7
2019-09-20 19:29:06 +08:00
jinhai 15a1c186f7 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-576 Scheduler refactor

See merge request megasearch/milvus!601

Former-commit-id: e9e3d4e87aedf2a959845fdb67d52f1fe2c1ffc6
2019-09-20 18:26:33 +08:00
jinhai 161fb4f99b Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-578 makesure milvus5.0 dont crack 0.3.1 data

See merge request megasearch/milvus!600

Former-commit-id: e61887c0ea0ec243ffb35703edbda5c74028b5a8
2019-09-20 18:26:30 +08:00
Yu Kun cfc42c5471 MS-576 Scheduler refactor
Former-commit-id: dc9317412c5dc72191381d5a634e7e9ff14f98b2
2019-09-20 18:02:08 +08:00
starlord c13edb909e MS-578 makesure milvus5.0 dont crack 0.3.1 data
Former-commit-id: e3c81573e4a28ac51b564db548dd29fee92e1915
2019-09-20 17:35:31 +08:00
test 48e296ca8c Merge branch 'branch-0.5.0' of http://192.168.1.105:6060/megasearch/milvus into branch-0.5.0
Former-commit-id: dc9986a7dd5d09aabf5bc16f4840a2cac4538848
2019-09-20 09:14:38 +00:00
test 5806f1dd5c MS-575 Add Clang-format & Clang-tidy & Cpplint
Former-commit-id: 9e0fe09aaa5f30b7fcdafa66415b9b35921954c9
2019-09-20 09:14:20 +00:00
yudong.cai 82e37e11ba MS-574 uniform config name format, add config default value
Former-commit-id: 2d11027d4b70632e22b3100fb2bde91c86972969
2019-09-20 17:08:26 +08:00
jinhai a9c5b7b386 Merge branch 'Refactor_Knowhere' into 'branch-0.5.0'
MS-583 Change to Status from errorcode

See merge request megasearch/milvus!599

Former-commit-id: 7173cb0bcb9e6669c124e75696b5c271da94b036
2019-09-20 17:07:43 +08:00
jinhai 481f1e543a Merge branch 'branch-0.5.0' into 'branch-0.5.0'
Branch 0.5.0

See merge request megasearch/milvus!598

Former-commit-id: eb4d708b112a23923100536e3c71c4fcef3802eb
2019-09-20 17:07:31 +08:00
test 62b993295e MS-575 Add Clang-format & Clang-tidy & Cpplint
Former-commit-id: 0e94a8add6753a158ce59912826a553a32fa8566
2019-09-20 09:00:15 +00:00
test 40f441ddd6 Merge branch 'branch-0.5.0' of http://192.168.1.105:6060/megasearch/milvus into branch-0.5.0
Former-commit-id: 8caea68514c6eed0fc8fc7ecd13f7778d1185977
2019-09-20 08:59:12 +00:00
test 4c944e1b72 MS-575 Add Clang-format & Clang-tidy & Cpplint
Former-commit-id: f72da7918b3696f906d0f3a2ef8590b6bd16d3d2
2019-09-20 08:59:05 +00:00
Heisenberg 72ffa6c4fd MS-583 Change to Status from errorcode
Former-commit-id: 63ba084d42e2fba75a581895cb3513666bff4329
2019-09-20 16:10:29 +08:00
Jeff 26e06cdcf4 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
fix typo

See merge request megasearch/milvus!597

Former-commit-id: b7b5d95fa1d0a9e93c0bd24d4ee720cb6ab8a8f3
2019-09-20 15:41:10 +08:00
jielin.xu 36fd87481b Update CONTRIBUTING.md
Former-commit-id: bb1f9f679c416bfd203960c8cb4e0052a977a6d8
2019-09-20 15:40:52 +08:00
starlord 94b5ec4919 fix typo
Former-commit-id: a35553692abacc8cbb1f94f5924871a1202f3e08
2019-09-20 15:40:10 +08:00
jielin.xu 0f5eafbac9 Update CONTRIBUTING.md
Former-commit-id: 520f3864e633125cbf6a156c59a546e05b3ca2f2
2019-09-20 15:35:00 +08:00
jielin.xu e364d7fa11 Update CONTRIBUTING.md
Former-commit-id: 9c22848294d0e339b76d38637b2d0494842cc4b7
2019-09-20 15:33:42 +08:00
test 7f12117031 Merge branch 'branch-0.5.0' of http://192.168.1.105:6060/megasearch/milvus into branch-0.5.0
Former-commit-id: d978a598f209139e8d3936a60eb34ae2fa3b4d42
2019-09-20 06:57:40 +00:00
test 0ff59df1a4 MS-575 Add Clang-format & Clang-tidy & Cpplint
Former-commit-id: e62b3b42b0b27c3bbbb6d62cfff4a518913298d7
2019-09-20 06:57:23 +00:00
jinhai ae428c6ff6 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-578 makesure milvus5.0 dont crack 0.3.1 data

See merge request megasearch/milvus!596

Former-commit-id: 61fd0fd041c9979ca7d9f761681bd1b80612318c
2019-09-20 13:01:39 +08:00
starlord 24b8e393bf merge code
Former-commit-id: 213b4823192af7e340ac5a250c363d0a32a3c3aa
2019-09-20 11:53:04 +08:00