snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-27 04:25:06 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge #2120

Browse Source 
2120: Bring `stable` into `main` r=curquiza a=curquiza

I forgot to do it, tell me `@Kerollmops` or `@irevoire` if it's useful or not. I would say yes, otherwise I will have conflict when I will try to bring `main` into `stable` for the next release. Maybe I'm wrong

Co-authored-by: Irevoire <tamo@meilisearch.com>
Co-authored-by: mpostma <postma.marin@protonmail.com>
Co-authored-by: Tamo <tamo@meilisearch.com>
Co-authored-by: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
Co-authored-by: Clémentine Urquizar - curqui <clementine@meilisearch.com>
This commit is contained in:
bors[bot] 2022-01-27 09:35:21 +00:00 committed by GitHub
commit 054598734a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Cargo.lock generated
View File

@ -977,7 +977,7 @@ dependencies = [
[[package]] [[package]]
name = "filter-parser" name = "filter-parser"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/meilisearch/milli.git?tag=v0.21.0#c83b77304a3062bdbb5b2a3503a710711caebdea" source = "git+https://github.com/meilisearch/milli.git?tag=v0.21.1#7f50ca9a20090fc4fe2abae0394c1e6fdd351ebd"
dependencies = [ dependencies = [
"nom", "nom",
"nom_locate", "nom_locate",
@ -1675,7 +1675,7 @@ dependencies = [
[[package]] [[package]]
name = "meilisearch-error" name = "meilisearch-error"
version = "0.25.0" version = "0.25.2"
dependencies = [ dependencies = [
"actix-web", "actix-web",
"proptest", "proptest",
@ -1686,7 +1686,7 @@ dependencies = [
[[package]] [[package]]
name = "meilisearch-http" name = "meilisearch-http"
version = "0.25.0" version = "0.25.2"
dependencies = [ dependencies = [
"actix-cors", "actix-cors",
"actix-rt", "actix-rt",
@ -1759,7 +1759,7 @@ dependencies = [
[[package]] [[package]]
name = "meilisearch-lib" name = "meilisearch-lib"
version = "0.25.0" version = "0.25.2"
dependencies = [ dependencies = [
"actix-rt", "actix-rt",
"actix-web", "actix-web",
@ -1860,8 +1860,8 @@ dependencies = [
[[package]] [[package]]
name = "milli" name = "milli"
version = "0.21.0" version = "0.21.1"
source = "git+https://github.com/meilisearch/milli.git?tag=v0.21.0#c83b77304a3062bdbb5b2a3503a710711caebdea" source = "git+https://github.com/meilisearch/milli.git?tag=v0.21.1#7f50ca9a20090fc4fe2abae0394c1e6fdd351ebd"
dependencies = [ dependencies = [
"bimap", "bimap",
"bincode", "bincode",

2
meilisearch-error/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "meilisearch-error" name = "meilisearch-error"
version = "0.25.0" version = "0.25.2"
authors = ["marin <postma.marin@protonmail.com>"] authors = ["marin <postma.marin@protonmail.com>"]
edition = "2021" edition = "2021"

2
meilisearch-http/Cargo.toml
View File

@ -4,7 +4,7 @@ description = "Meilisearch HTTP server"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"
name = "meilisearch-http" name = "meilisearch-http"
version = "0.25.0" version = "0.25.2"
[[bin]] [[bin]]
name = "meilisearch" name = "meilisearch"

4
meilisearch-lib/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "meilisearch-lib" name = "meilisearch-lib"
version = "0.25.0" version = "0.25.2"
edition = "2021" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@ -28,7 +28,7 @@ lazy_static = "1.4.0"
log = "0.4.14" log = "0.4.14"
meilisearch-error = { path = "../meilisearch-error" } meilisearch-error = { path = "../meilisearch-error" }
meilisearch-auth = { path = "../meilisearch-auth" } meilisearch-auth = { path = "../meilisearch-auth" }
milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.21.0" } milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.21.1" }
mime = "0.3.16" mime = "0.3.16"
num_cpus = "1.13.0" num_cpus = "1.13.0"
once_cell = "1.8.0" once_cell = "1.8.0"