Commit Graph

2833 Commits (54484d79ce7132381c86f0b668c5ea8eccdae419)

Author SHA1 Message Date
jinhai 0fb840b91c Merge branch 'branch-0.5.0' of http://192.168.1.105:6060/megasearch/milvus into branch-0.5.0
Former-commit-id: 9efc38e4e13c7c10ace0b00c602a3c1bad63707c
2019-09-18 17:47:30 +08:00
jinhai 4305c8305f MS-567 - Add NOTICE.md
Former-commit-id: dba7a33adab252b6bfe853dfc1ddedf357073716
2019-09-18 17:47:18 +08:00
jinhai b32666a407 Merge branch 'refactor_knowhere' into 'branch-0.5.0'
MS-565 Refactor knowhere

See merge request megasearch/milvus!581

Former-commit-id: 61180414e4319c25e0dcc4af5442233765c6c3ae
2019-09-18 17:40:39 +08:00
xiaojun.lin 59ea536db6 MS-565 1. del wrapper/knowhere
Former-commit-id: 3905da5c0716c6fe8317588c27a61b4a5c36316e
2019-09-18 17:36:47 +08:00
zhiru a5b3dea158 update
Former-commit-id: 3d3617149b664de4d6af554af6e984163b963fe6
2019-09-18 17:30:05 +08:00
xiaojun.lin ed105628fc MS-565 1. refactor dir structure 2. add license 3. del swig
Former-commit-id: 580d35b9fe3ea71ebc7d6096fbf5d905351f34f5
2019-09-18 17:27:18 +08:00
peng.xu 6172258eed Merge branch 'branch-0.5.0' into 'branch-0.5.0'
add log for table file miss issue

See merge request megasearch/milvus!580

Former-commit-id: 1d1f3a598de27ffb58191394c4bce201a75e2034
2019-09-18 16:42:46 +08:00
starlord 8e5197a53b add log for table file miss issue
Former-commit-id: 641bc002a5f760e9bd804c99897d0c6c84f07919
2019-09-18 16:41:42 +08:00
jinhai 2a709fdcb8 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
Branch 0.5.0

See merge request megasearch/milvus!574

Former-commit-id: 0baa159eaada35caae20f3f1246b4a2d39527f72
2019-09-18 15:56:35 +08:00
zhiru b364c8e3a7 update
Former-commit-id: 034185feb37416994a52ddf14a30daa06c886f14
2019-09-18 15:51:17 +08:00
zhiru 8464b8a206 refactor cmake
Former-commit-id: 587cc22f501fd12cbdaf2d9950fce3f2483c7020
2019-09-18 15:49:47 +08:00
Yu Kun 795ed3cf8e Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0
Former-commit-id: 39277e83cae742e3b2b7dc288f516a833e89a38b
2019-09-18 15:34:55 +08:00
Yu Kun e852816176 fix memory leak
Former-commit-id: 397a13f633b1b120c516db97ed46e5c8836db1ce
2019-09-18 15:34:47 +08:00
jielin.xu 554c1808d5 Update README.md
Former-commit-id: 5843202bb1d4083ab1ed802f1aa3cd730a63d1d9
2019-09-18 15:17:04 +08:00
zhiru 80dbaebde3 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0
Former-commit-id: 73c08f0a1c4bb6913ea026c011bcb4dc9037e369
2019-09-18 15:11:03 +08:00
peng.xu 885f9ec165 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
refine code

See merge request megasearch/milvus!577

Former-commit-id: 8a169535e70225a073bda474c657f7ca11fca90d
2019-09-18 15:08:14 +08:00
starlord 8eaf03a279 refine code
Former-commit-id: 710c122428d52f56a7bf41903afa4a7f8c6db01e
2019-09-18 15:05:51 +08:00
starlord 8e6cd33b5e Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0
Former-commit-id: c7ad1d8c54730fcb277f7d8a20d93f88cb9d70aa
2019-09-18 13:56:17 +08:00
peng.xu 73ff79dbb8 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-558 refine status code

See merge request megasearch/milvus!576

Former-commit-id: 84c716e051e4049733eb956c59507e8514ea37c0
2019-09-18 13:54:18 +08:00
starlord cc02093029 Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0
Former-commit-id: 2a518240fd2f4e4fbdcb8a653f98d6520fa79315
2019-09-18 12:49:38 +08:00
starlord 69ce92dcc5 MS-558 refine status code
Former-commit-id: ebb5ec55a58cfce4385f39d186e86d858eab1bf0
2019-09-18 12:49:29 +08:00
zhiru e7b8b32617 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0
Former-commit-id: 5d9c7b3b3f5c91939321c7d59a481ea085f9f553
2019-09-18 11:29:37 +08:00
peng.xu 8a1001c0b8 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-562 Add JobMgr and TaskCreator in Scheduler

See merge request megasearch/milvus!575

Former-commit-id: 8af2ffc75aa53bf783fe83bb1d2178b337b98144
2019-09-18 10:44:41 +08:00
wxyu 5a2743946b MS-562 Add JobMgr and TaskCreator in Scheduler
Former-commit-id: bbaf2b649843e86fc7bbd28ec61e5a990fc5951f
2019-09-18 10:42:01 +08:00
zhiru 51055a29f3 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0
Former-commit-id: ce5580ff84fecbcc1872ce6cf74a981af5ed98d9
2019-09-18 10:27:26 +08:00
jielin.xu 918f299c69 Update README.md
Former-commit-id: bf982801e6f7b3b82ff6ae1af98b66a29bf8b55c
2019-09-17 18:57:14 +08:00
jielin.xu 0f955f5183 Update README.md
Former-commit-id: 9a58a8165f60984fb06ba98f863c571989052dde
2019-09-17 18:56:33 +08:00
jielin.xu edd566b046 Update CHANGELOG.md
Former-commit-id: d822441834b09e510ed386ee64f436ac6c15e6af
2019-09-17 18:53:43 +08:00
jielin.xu a5ad6a19ed Update CHANGELOG.md
Former-commit-id: df346c406bdecbf100761b5aa3de710ba8325a46
2019-09-17 18:49:58 +08:00
peng.xu 91192242d9 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-558 refine status code

See merge request megasearch/milvus!573

Former-commit-id: 7dd4697f35a1742e58ff5e6d265110882c2e6a8b
2019-09-17 17:43:07 +08:00
starlord e16ac72a25 MS-558 refine status code
Former-commit-id: cb176cf273ec66e1f7f5e89e9ba4c39cabc511ea
2019-09-17 17:37:31 +08:00
jielin.xu 3cea080566 Add new file
Former-commit-id: a07c10c27a7ca33125b7fb3c4634f3dd24317905
2019-09-17 14:39:43 +08:00
jielin.xu 17792a37ae Update README.md
Former-commit-id: 625e0ce886fdb20c072e136364b6652517c1bb65
2019-09-17 14:31:17 +08:00
jielin.xu 7941aa5caf Update README.md
Former-commit-id: 7b155725e3407f47c6432ce0d678a1c783b29ed8
2019-09-17 14:29:04 +08:00
jielin.xu fa9b470ddf Update CONTRIBUTING.md
Former-commit-id: 91a46fa2630cbcd50cdd35168449d474dcb36337
2019-09-17 14:25:31 +08:00
jielin.xu 359a71de5a Update CONTRIBUTING.md
Former-commit-id: 17c0b8e8ac44b035ed441c91a661b60e870d56db
2019-09-17 14:23:31 +08:00
jielin.xu 9753941651 Add new file
Former-commit-id: 718692a49171c7bb36219dbbd0db024427b40904
2019-09-17 14:15:42 +08:00
zhiru c5d0a6e5ae Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0
Former-commit-id: 3d8b3c771fecc82184ac5051e39fb5e61353ad24
2019-09-17 14:14:17 +08:00
zhiru 49f80d3cb7 update main CMakeList
Former-commit-id: 68124f2a284c90ef72edc07d530e88fa67a7ed6a
2019-09-17 14:14:15 +08:00
peng.xu dfd9ab16f6 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-557 merge Log.h

See merge request megasearch/milvus!572

Former-commit-id: a525b9e9d1cc0edbe001c7350c646a2895efcb8a
2019-09-17 11:08:04 +08:00
starlord 5f07962cd4 MS-557 merge Log.h
Former-commit-id: 37a1aece83b0885aef1ad60fbd3b26805df57a54
2019-09-17 11:07:39 +08:00
starlord 9d53224b6a MS-557 merge Log.h
Former-commit-id: 0fb5985bc71132307d66eea85c098d3518935c8c
2019-09-17 11:06:26 +08:00
starlord b77155f3ec merge Log.h
Former-commit-id: 3de21b82b857b7601075b977792ffdd36638e800
2019-09-17 11:05:09 +08:00
jinhai 70f4bf0046 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-556 Add Job Definition in Scheduler

See merge request megasearch/milvus!571

Former-commit-id: 46d3c4a763e4ee6bb40c73f237ad9ed3f88ec087
2019-09-17 11:00:16 +08:00
wxyu 909e2a0934 add Apache License
Former-commit-id: 8afccd9400189249b2f0c797e6e0f53f74547246
2019-09-17 10:59:51 +08:00
wxyu 6cbf62c35f Merge remote-tracking branch 'main/branch-0.5.0' into branch-0.5.0
Former-commit-id: 3b0b477ac496700e63f0ecf51fed63d100f2bd24
2019-09-17 10:58:01 +08:00
starlord 63bd4cca5c merge Log.h
Former-commit-id: 1204cfbfddee0b863abf10874ef97f0581c36a9a
2019-09-17 10:57:41 +08:00
wxyu dc559ef2ca solve conflicts
Former-commit-id: 42e851d305e116053bc8cbf57dffc4161e66bc48
2019-09-17 10:55:46 +08:00
jinhai cd16ed634d Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-554 Change license to apache 2.0

See merge request megasearch/milvus!570

Former-commit-id: 612f50c168b19eabc270deb1249e8c646dd9b05c
2019-09-17 10:55:13 +08:00
wxyu af9c167ed0 MS-556 Add Job Definition in Scheduler
Former-commit-id: 87787757226f3b397d65125a687442222a5d3532
2019-09-17 10:54:51 +08:00