diff options
author | Alex <alex@adnab.me> | 2023-03-13 18:34:33 +0000 |
---|---|---|
committer | Alex <alex@adnab.me> | 2023-03-13 18:34:33 +0000 |
commit | 703ac43f1c7c0538ac72a06afc16ad182c3aaba1 (patch) | |
tree | 7ae124a8b7165edab933bc9649baf9c126e95c92 | |
parent | d6ffa57f4054c41c37a06686330e0080f8243430 (diff) | |
parent | 000006d689d2d8075599fbe1653605566ae9d36e (diff) | |
download | garage-703ac43f1c7c0538ac72a06afc16ad182c3aaba1.tar.gz garage-703ac43f1c7c0538ac72a06afc16ad182c3aaba1.zip |
Merge pull request 'Prepare for v0.8.2' (#530) from prepare-v082 into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/530
-rw-r--r-- | Cargo.lock | 18 | ||||
-rw-r--r-- | Cargo.nix | 120 | ||||
-rw-r--r-- | src/api/Cargo.toml | 12 | ||||
-rw-r--r-- | src/block/Cargo.toml | 10 | ||||
-rw-r--r-- | src/block/repair.rs | 1 | ||||
-rw-r--r-- | src/db/Cargo.toml | 2 | ||||
-rw-r--r-- | src/garage/Cargo.toml | 18 | ||||
-rw-r--r-- | src/k2v-client/Cargo.toml | 2 | ||||
-rw-r--r-- | src/model/Cargo.toml | 12 | ||||
-rw-r--r-- | src/model/k2v/item_table.rs | 1 | ||||
-rw-r--r-- | src/model/s3/object_table.rs | 1 | ||||
-rw-r--r-- | src/rpc/Cargo.toml | 4 | ||||
-rw-r--r-- | src/table/Cargo.toml | 8 | ||||
-rw-r--r-- | src/util/Cargo.toml | 4 | ||||
-rw-r--r-- | src/web/Cargo.toml | 10 |
15 files changed, 111 insertions, 112 deletions
@@ -1075,7 +1075,7 @@ dependencies = [ [[package]] name = "garage" -version = "0.8.1" +version = "0.8.2" dependencies = [ "assert-json-diff", "async-trait", @@ -1122,7 +1122,7 @@ dependencies = [ [[package]] name = "garage_api" -version = "0.8.1" +version = "0.8.2" dependencies = [ "async-trait", "base64 0.21.0", @@ -1167,7 +1167,7 @@ dependencies = [ [[package]] name = "garage_block" -version = "0.8.1" +version = "0.8.2" dependencies = [ "arc-swap", "async-compression", @@ -1192,7 +1192,7 @@ dependencies = [ [[package]] name = "garage_db" -version = "0.8.1" +version = "0.8.2" dependencies = [ "clap 4.1.4", "err-derive", @@ -1207,7 +1207,7 @@ dependencies = [ [[package]] name = "garage_model" -version = "0.8.1" +version = "0.8.2" dependencies = [ "arc-swap", "async-trait", @@ -1234,7 +1234,7 @@ dependencies = [ [[package]] name = "garage_rpc" -version = "0.8.1" +version = "0.8.2" dependencies = [ "arc-swap", "async-trait", @@ -1265,7 +1265,7 @@ dependencies = [ [[package]] name = "garage_table" -version = "0.8.1" +version = "0.8.2" dependencies = [ "arc-swap", "async-trait", @@ -1287,7 +1287,7 @@ dependencies = [ [[package]] name = "garage_util" -version = "0.8.1" +version = "0.8.2" dependencies = [ "arc-swap", "async-trait", @@ -1321,7 +1321,7 @@ dependencies = [ [[package]] name = "garage_web" -version = "0.8.1" +version = "0.8.2" dependencies = [ "err-derive", "futures", @@ -32,7 +32,7 @@ args@{ ignoreLockHash, }: let - nixifiedLockHash = "d36a8590fdf6eeb128a5a852d55945b595d5830291ad0aca95a21dcc1fab8681"; + nixifiedLockHash = "af19dd561f2ce73d1f609040c1ebdf74420974d96959016da98d44b0e347f013"; workspaceSrc = if args.workspaceSrc == null then ./. else args.workspaceSrc; currentLockHash = builtins.hashFile "sha256" (workspaceSrc + /Cargo.lock); lockHashIgnored = if ignoreLockHash @@ -56,15 +56,15 @@ in { cargo2nixVersion = "0.11.0"; workspace = { - garage_db = rustPackages.unknown.garage_db."0.8.1"; - garage_util = rustPackages.unknown.garage_util."0.8.1"; - garage_rpc = rustPackages.unknown.garage_rpc."0.8.1"; - garage_table = rustPackages.unknown.garage_table."0.8.1"; - garage_block = rustPackages.unknown.garage_block."0.8.1"; - garage_model = rustPackages.unknown.garage_model."0.8.1"; - garage_api = rustPackages.unknown.garage_api."0.8.1"; - garage_web = rustPackages.unknown.garage_web."0.8.1"; - garage = rustPackages.unknown.garage."0.8.1"; + garage_db = rustPackages.unknown.garage_db."0.8.2"; + garage_util = rustPackages.unknown.garage_util."0.8.2"; + garage_rpc = rustPackages.unknown.garage_rpc."0.8.2"; + garage_table = rustPackages.unknown.garage_table."0.8.2"; + garage_block = rustPackages.unknown.garage_block."0.8.2"; + garage_model = rustPackages.unknown.garage_model."0.8.2"; + garage_api = rustPackages.unknown.garage_api."0.8.2"; + garage_web = rustPackages.unknown.garage_web."0.8.2"; + garage = rustPackages.unknown.garage."0.8.2"; k2v-client = rustPackages.unknown.k2v-client."0.1.1"; }; "registry+https://github.com/rust-lang/crates.io-index".addr2line."0.19.0" = overridableMkRustCrate (profileName: rec { @@ -1531,9 +1531,9 @@ in }; }); - "unknown".garage."0.8.1" = overridableMkRustCrate (profileName: rec { + "unknown".garage."0.8.2" = overridableMkRustCrate (profileName: rec { name = "garage"; - version = "0.8.1"; + version = "0.8.2"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/garage"); features = builtins.concatLists [ @@ -1559,14 +1559,14 @@ in bytesize = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".bytesize."1.1.0" { inherit profileName; }).out; futures = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.25" { inherit profileName; }).out; futures_util = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.25" { inherit profileName; }).out; - garage_api = (rustPackages."unknown".garage_api."0.8.1" { inherit profileName; }).out; - garage_block = (rustPackages."unknown".garage_block."0.8.1" { inherit profileName; }).out; - garage_db = (rustPackages."unknown".garage_db."0.8.1" { inherit profileName; }).out; - garage_model = (rustPackages."unknown".garage_model."0.8.1" { inherit profileName; }).out; - garage_rpc = (rustPackages."unknown".garage_rpc."0.8.1" { inherit profileName; }).out; - garage_table = (rustPackages."unknown".garage_table."0.8.1" { inherit profileName; }).out; - garage_util = (rustPackages."unknown".garage_util."0.8.1" { inherit profileName; }).out; - garage_web = (rustPackages."unknown".garage_web."0.8.1" { inherit profileName; }).out; + garage_api = (rustPackages."unknown".garage_api."0.8.2" { inherit profileName; }).out; + garage_block = (rustPackages."unknown".garage_block."0.8.2" { inherit profileName; }).out; + garage_db = (rustPackages."unknown".garage_db."0.8.2" { inherit profileName; }).out; + garage_model = (rustPackages."unknown".garage_model."0.8.2" { inherit profileName; }).out; + garage_rpc = (rustPackages."unknown".garage_rpc."0.8.2" { inherit profileName; }).out; + garage_table = (rustPackages."unknown".garage_table."0.8.2" { inherit profileName; }).out; + garage_util = (rustPackages."unknown".garage_util."0.8.2" { inherit profileName; }).out; + garage_web = (rustPackages."unknown".garage_web."0.8.2" { inherit profileName; }).out; hex = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }).out; sodiumoxide = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".kuska-sodiumoxide."0.2.5-0" { inherit profileName; }).out; netapp = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".netapp."0.5.2" { inherit profileName; }).out; @@ -1599,9 +1599,9 @@ in }; }); - "unknown".garage_api."0.8.1" = overridableMkRustCrate (profileName: rec { + "unknown".garage_api."0.8.2" = overridableMkRustCrate (profileName: rec { name = "garage_api"; - version = "0.8.1"; + version = "0.8.2"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/api"); features = builtins.concatLists [ @@ -1620,11 +1620,11 @@ in form_urlencoded = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".form_urlencoded."1.1.0" { inherit profileName; }).out; futures = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.25" { inherit profileName; }).out; futures_util = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.25" { inherit profileName; }).out; - garage_block = (rustPackages."unknown".garage_block."0.8.1" { inherit profileName; }).out; - garage_model = (rustPackages."unknown".garage_model."0.8.1" { inherit profileName; }).out; - garage_rpc = (rustPackages."unknown".garage_rpc."0.8.1" { inherit profileName; }).out; - garage_table = (rustPackages."unknown".garage_table."0.8.1" { inherit profileName; }).out; - garage_util = (rustPackages."unknown".garage_util."0.8.1" { inherit profileName; }).out; + garage_block = (rustPackages."unknown".garage_block."0.8.2" { inherit profileName; }).out; + garage_model = (rustPackages."unknown".garage_model."0.8.2" { inherit profileName; }).out; + garage_rpc = (rustPackages."unknown".garage_rpc."0.8.2" { inherit profileName; }).out; + garage_table = (rustPackages."unknown".garage_table."0.8.2" { inherit profileName; }).out; + garage_util = (rustPackages."unknown".garage_util."0.8.2" { inherit profileName; }).out; hex = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }).out; hmac = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hmac."0.12.1" { inherit profileName; }).out; http = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".http."0.2.8" { inherit profileName; }).out; @@ -1653,9 +1653,9 @@ in }; }); - "unknown".garage_block."0.8.1" = overridableMkRustCrate (profileName: rec { + "unknown".garage_block."0.8.2" = overridableMkRustCrate (profileName: rec { name = "garage_block"; - version = "0.8.1"; + version = "0.8.2"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/block"); features = builtins.concatLists [ @@ -1668,10 +1668,10 @@ in bytes = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".bytes."1.3.0" { inherit profileName; }).out; futures = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.25" { inherit profileName; }).out; futures_util = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.25" { inherit profileName; }).out; - garage_db = (rustPackages."unknown".garage_db."0.8.1" { inherit profileName; }).out; - garage_rpc = (rustPackages."unknown".garage_rpc."0.8.1" { inherit profileName; }).out; - garage_table = (rustPackages."unknown".garage_table."0.8.1" { inherit profileName; }).out; - garage_util = (rustPackages."unknown".garage_util."0.8.1" { inherit profileName; }).out; + garage_db = (rustPackages."unknown".garage_db."0.8.2" { inherit profileName; }).out; + garage_rpc = (rustPackages."unknown".garage_rpc."0.8.2" { inherit profileName; }).out; + garage_table = (rustPackages."unknown".garage_table."0.8.2" { inherit profileName; }).out; + garage_util = (rustPackages."unknown".garage_util."0.8.2" { inherit profileName; }).out; hex = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }).out; opentelemetry = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".opentelemetry."0.17.0" { inherit profileName; }).out; rand = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".rand."0.8.5" { inherit profileName; }).out; @@ -1684,9 +1684,9 @@ in }; }); - "unknown".garage_db."0.8.1" = overridableMkRustCrate (profileName: rec { + "unknown".garage_db."0.8.2" = overridableMkRustCrate (profileName: rec { name = "garage_db"; - version = "0.8.1"; + version = "0.8.2"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/db"); features = builtins.concatLists [ @@ -1716,9 +1716,9 @@ in }; }); - "unknown".garage_model."0.8.1" = overridableMkRustCrate (profileName: rec { + "unknown".garage_model."0.8.2" = overridableMkRustCrate (profileName: rec { name = "garage_model"; - version = "0.8.1"; + version = "0.8.2"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/model"); features = builtins.concatLists [ @@ -1736,11 +1736,11 @@ in err_derive = (buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".err-derive."0.3.1" { profileName = "__noProfile"; }).out; futures = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.25" { inherit profileName; }).out; futures_util = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.25" { inherit profileName; }).out; - garage_block = (rustPackages."unknown".garage_block."0.8.1" { inherit profileName; }).out; - garage_db = (rustPackages."unknown".garage_db."0.8.1" { inherit profileName; }).out; - garage_rpc = (rustPackages."unknown".garage_rpc."0.8.1" { inherit profileName; }).out; - garage_table = (rustPackages."unknown".garage_table."0.8.1" { inherit profileName; }).out; - garage_util = (rustPackages."unknown".garage_util."0.8.1" { inherit profileName; }).out; + garage_block = (rustPackages."unknown".garage_block."0.8.2" { inherit profileName; }).out; + garage_db = (rustPackages."unknown".garage_db."0.8.2" { inherit profileName; }).out; + garage_rpc = (rustPackages."unknown".garage_rpc."0.8.2" { inherit profileName; }).out; + garage_table = (rustPackages."unknown".garage_table."0.8.2" { inherit profileName; }).out; + garage_util = (rustPackages."unknown".garage_util."0.8.2" { inherit profileName; }).out; hex = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }).out; netapp = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".netapp."0.5.2" { inherit profileName; }).out; opentelemetry = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".opentelemetry."0.17.0" { inherit profileName; }).out; @@ -1753,9 +1753,9 @@ in }; }); - "unknown".garage_rpc."0.8.1" = overridableMkRustCrate (profileName: rec { + "unknown".garage_rpc."0.8.2" = overridableMkRustCrate (profileName: rec { name = "garage_rpc"; - version = "0.8.1"; + version = "0.8.2"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/rpc"); features = builtins.concatLists [ @@ -1775,7 +1775,7 @@ in ${ if rootFeatures' ? "garage/consul-discovery" || rootFeatures' ? "garage_rpc/consul-discovery" || rootFeatures' ? "garage_rpc/err-derive" then "err_derive" else null } = (buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".err-derive."0.3.1" { profileName = "__noProfile"; }).out; futures = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.25" { inherit profileName; }).out; futures_util = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.25" { inherit profileName; }).out; - garage_util = (rustPackages."unknown".garage_util."0.8.1" { inherit profileName; }).out; + garage_util = (rustPackages."unknown".garage_util."0.8.2" { inherit profileName; }).out; gethostname = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".gethostname."0.2.3" { inherit profileName; }).out; hex = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }).out; ${ if rootFeatures' ? "garage/kubernetes-discovery" || rootFeatures' ? "garage_rpc/k8s-openapi" || rootFeatures' ? "garage_rpc/kubernetes-discovery" then "k8s_openapi" else null } = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".k8s-openapi."0.16.0" { inherit profileName; }).out; @@ -1797,9 +1797,9 @@ in }; }); - "unknown".garage_table."0.8.1" = overridableMkRustCrate (profileName: rec { + "unknown".garage_table."0.8.2" = overridableMkRustCrate (profileName: rec { name = "garage_table"; - version = "0.8.1"; + version = "0.8.2"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/table"); dependencies = { @@ -1808,9 +1808,9 @@ in bytes = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".bytes."1.3.0" { inherit profileName; }).out; futures = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.25" { inherit profileName; }).out; futures_util = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.25" { inherit profileName; }).out; - garage_db = (rustPackages."unknown".garage_db."0.8.1" { inherit profileName; }).out; - garage_rpc = (rustPackages."unknown".garage_rpc."0.8.1" { inherit profileName; }).out; - garage_util = (rustPackages."unknown".garage_util."0.8.1" { inherit profileName; }).out; + garage_db = (rustPackages."unknown".garage_db."0.8.2" { inherit profileName; }).out; + garage_rpc = (rustPackages."unknown".garage_rpc."0.8.2" { inherit profileName; }).out; + garage_util = (rustPackages."unknown".garage_util."0.8.2" { inherit profileName; }).out; hex = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }).out; hexdump = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hexdump."0.1.1" { inherit profileName; }).out; opentelemetry = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".opentelemetry."0.17.0" { inherit profileName; }).out; @@ -1822,9 +1822,9 @@ in }; }); - "unknown".garage_util."0.8.1" = overridableMkRustCrate (profileName: rec { + "unknown".garage_util."0.8.2" = overridableMkRustCrate (profileName: rec { name = "garage_util"; - version = "0.8.1"; + version = "0.8.2"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/util"); features = builtins.concatLists [ @@ -1839,7 +1839,7 @@ in digest = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".digest."0.10.6" { inherit profileName; }).out; err_derive = (buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".err-derive."0.3.1" { profileName = "__noProfile"; }).out; futures = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.25" { inherit profileName; }).out; - garage_db = (rustPackages."unknown".garage_db."0.8.1" { inherit profileName; }).out; + garage_db = (rustPackages."unknown".garage_db."0.8.2" { inherit profileName; }).out; git_version = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".git-version."0.3.5" { inherit profileName; }).out; hex = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }).out; hexdump = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hexdump."0.1.1" { inherit profileName; }).out; @@ -1866,18 +1866,18 @@ in }; }); - "unknown".garage_web."0.8.1" = overridableMkRustCrate (profileName: rec { + "unknown".garage_web."0.8.2" = overridableMkRustCrate (profileName: rec { name = "garage_web"; - version = "0.8.1"; + version = "0.8.2"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/web"); dependencies = { err_derive = (buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".err-derive."0.3.1" { profileName = "__noProfile"; }).out; futures = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.25" { inherit profileName; }).out; - garage_api = (rustPackages."unknown".garage_api."0.8.1" { inherit profileName; }).out; - garage_model = (rustPackages."unknown".garage_model."0.8.1" { inherit profileName; }).out; - garage_table = (rustPackages."unknown".garage_table."0.8.1" { inherit profileName; }).out; - garage_util = (rustPackages."unknown".garage_util."0.8.1" { inherit profileName; }).out; + garage_api = (rustPackages."unknown".garage_api."0.8.2" { inherit profileName; }).out; + garage_model = (rustPackages."unknown".garage_model."0.8.2" { inherit profileName; }).out; + garage_table = (rustPackages."unknown".garage_table."0.8.2" { inherit profileName; }).out; + garage_util = (rustPackages."unknown".garage_util."0.8.2" { inherit profileName; }).out; http = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".http."0.2.8" { inherit profileName; }).out; hyper = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hyper."0.14.23" { inherit profileName; }).out; opentelemetry = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".opentelemetry."0.17.0" { inherit profileName; }).out; @@ -2555,7 +2555,7 @@ in dependencies = { base64 = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".base64."0.21.0" { inherit profileName; }).out; ${ if rootFeatures' ? "k2v-client/clap" || rootFeatures' ? "k2v-client/cli" then "clap" else null } = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".clap."4.1.4" { inherit profileName; }).out; - ${ if rootFeatures' ? "k2v-client/cli" || rootFeatures' ? "k2v-client/garage_util" then "garage_util" else null } = (rustPackages."unknown".garage_util."0.8.1" { inherit profileName; }).out; + ${ if rootFeatures' ? "k2v-client/cli" || rootFeatures' ? "k2v-client/garage_util" then "garage_util" else null } = (rustPackages."unknown".garage_util."0.8.2" { inherit profileName; }).out; http = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".http."0.2.8" { inherit profileName; }).out; hyper_rustls = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".hyper-rustls."0.23.2" { inherit profileName; }).out; log = (rustPackages."registry+https://github.com/rust-lang/crates.io-index".log."0.4.17" { inherit profileName; }).out; diff --git a/src/api/Cargo.toml b/src/api/Cargo.toml index 24c48604..40793fd5 100644 --- a/src/api/Cargo.toml +++ b/src/api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_api" -version = "0.8.1" +version = "0.8.2" authors = ["Alex Auvolat <alex@adnab.me>"] edition = "2018" license = "AGPL-3.0" @@ -14,11 +14,11 @@ path = "lib.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -garage_model = { version = "0.8.1", path = "../model" } -garage_table = { version = "0.8.1", path = "../table" } -garage_block = { version = "0.8.1", path = "../block" } -garage_util = { version = "0.8.1", path = "../util" } -garage_rpc = { version = "0.8.1", path = "../rpc" } +garage_model = { version = "0.8.2", path = "../model" } +garage_table = { version = "0.8.2", path = "../table" } +garage_block = { version = "0.8.2", path = "../block" } +garage_util = { version = "0.8.2", path = "../util" } +garage_rpc = { version = "0.8.2", path = "../rpc" } async-trait = "0.1.7" base64 = "0.21" diff --git a/src/block/Cargo.toml b/src/block/Cargo.toml index a7e8bc2c..c6985754 100644 --- a/src/block/Cargo.toml +++ b/src/block/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_block" -version = "0.8.1" +version = "0.8.2" authors = ["Alex Auvolat <alex@adnab.me>"] edition = "2018" license = "AGPL-3.0" @@ -14,10 +14,10 @@ path = "lib.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -garage_db = { version = "0.8.1", path = "../db" } -garage_rpc = { version = "0.8.1", path = "../rpc" } -garage_util = { version = "0.8.1", path = "../util" } -garage_table = { version = "0.8.1", path = "../table" } +garage_db = { version = "0.8.2", path = "../db" } +garage_rpc = { version = "0.8.2", path = "../rpc" } +garage_util = { version = "0.8.2", path = "../util" } +garage_table = { version = "0.8.2", path = "../table" } opentelemetry = "0.17" diff --git a/src/block/repair.rs b/src/block/repair.rs index 5476bf8a..37ccd59a 100644 --- a/src/block/repair.rs +++ b/src/block/repair.rs @@ -189,6 +189,7 @@ mod v082 { impl garage_util::migrate::Migrate for ScrubWorkerPersisted { type Previous = v081::ScrubWorkerPersisted; + const VERSION_MARKER: &'static [u8] = b"G082bswp"; fn migrate(old: v081::ScrubWorkerPersisted) -> ScrubWorkerPersisted { use crate::repair::randomize_next_scrub_run_time; diff --git a/src/db/Cargo.toml b/src/db/Cargo.toml index 95bde6d5..e3a65857 100644 --- a/src/db/Cargo.toml +++ b/src/db/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_db" -version = "0.8.1" +version = "0.8.2" authors = ["Alex Auvolat <alex@adnab.me>"] edition = "2018" license = "AGPL-3.0" diff --git a/src/garage/Cargo.toml b/src/garage/Cargo.toml index f938f356..0cbdf890 100644 --- a/src/garage/Cargo.toml +++ b/src/garage/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage" -version = "0.8.1" +version = "0.8.2" authors = ["Alex Auvolat <alex@adnab.me>"] edition = "2018" license = "AGPL-3.0" @@ -21,14 +21,14 @@ path = "tests/lib.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -garage_db = { version = "0.8.1", path = "../db" } -garage_api = { version = "0.8.1", path = "../api" } -garage_block = { version = "0.8.1", path = "../block" } -garage_model = { version = "0.8.1", path = "../model" } -garage_rpc = { version = "0.8.1", path = "../rpc" } -garage_table = { version = "0.8.1", path = "../table" } -garage_util = { version = "0.8.1", path = "../util" } -garage_web = { version = "0.8.1", path = "../web" } +garage_db = { version = "0.8.2", path = "../db" } +garage_api = { version = "0.8.2", path = "../api" } +garage_block = { version = "0.8.2", path = "../block" } +garage_model = { version = "0.8.2", path = "../model" } +garage_rpc = { version = "0.8.2", path = "../rpc" } +garage_table = { version = "0.8.2", path = "../table" } +garage_util = { version = "0.8.2", path = "../util" } +garage_web = { version = "0.8.2", path = "../web" } backtrace = "0.3" bytes = "1.0" diff --git a/src/k2v-client/Cargo.toml b/src/k2v-client/Cargo.toml index 88d52747..52c16d89 100644 --- a/src/k2v-client/Cargo.toml +++ b/src/k2v-client/Cargo.toml @@ -23,7 +23,7 @@ tokio = "1.24" # cli deps clap = { version = "4.1", optional = true, features = ["derive", "env"] } -garage_util = { version = "0.8.1", path = "../util", optional = true } +garage_util = { version = "0.8.2", path = "../util", optional = true } [features] diff --git a/src/model/Cargo.toml b/src/model/Cargo.toml index d1c7cd29..2b525a42 100644 --- a/src/model/Cargo.toml +++ b/src/model/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_model" -version = "0.8.1" +version = "0.8.2" authors = ["Alex Auvolat <alex@adnab.me>"] edition = "2018" license = "AGPL-3.0" @@ -14,11 +14,11 @@ path = "lib.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -garage_db = { version = "0.8.1", default-features = false, path = "../db" } -garage_rpc = { version = "0.8.1", path = "../rpc" } -garage_table = { version = "0.8.1", path = "../table" } -garage_block = { version = "0.8.1", path = "../block" } -garage_util = { version = "0.8.1", path = "../util" } +garage_db = { version = "0.8.2", default-features = false, path = "../db" } +garage_rpc = { version = "0.8.2", path = "../rpc" } +garage_table = { version = "0.8.2", path = "../table" } +garage_block = { version = "0.8.2", path = "../block" } +garage_util = { version = "0.8.2", path = "../util" } async-trait = "0.1.7" arc-swap = "1.0" diff --git a/src/model/k2v/item_table.rs b/src/model/k2v/item_table.rs index 84c05db5..9e3ba5a5 100644 --- a/src/model/k2v/item_table.rs +++ b/src/model/k2v/item_table.rs @@ -269,7 +269,6 @@ impl CountedItem for K2VItem { &self.partition.partition_key } - #[allow(clippy::bool_to_int_with_if)] fn counts(&self) -> Vec<(&'static str, i64)> { let values = self.values(); diff --git a/src/model/s3/object_table.rs b/src/model/s3/object_table.rs index 29614dc5..518acc95 100644 --- a/src/model/s3/object_table.rs +++ b/src/model/s3/object_table.rs @@ -355,7 +355,6 @@ impl CountedItem for Object { fn counts(&self) -> Vec<(&'static str, i64)> { let versions = self.versions(); - #[allow(clippy::bool_to_int_with_if)] let n_objects = if versions.iter().any(|v| v.is_data()) { 1 } else { diff --git a/src/rpc/Cargo.toml b/src/rpc/Cargo.toml index 2c1260a9..dcf44f4a 100644 --- a/src/rpc/Cargo.toml +++ b/src/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_rpc" -version = "0.8.1" +version = "0.8.2" authors = ["Alex Auvolat <alex@adnab.me>"] edition = "2018" license = "AGPL-3.0" @@ -14,7 +14,7 @@ path = "lib.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -garage_util = { version = "0.8.1", path = "../util" } +garage_util = { version = "0.8.2", path = "../util" } arc-swap = "1.0" bytes = "1.0" diff --git a/src/table/Cargo.toml b/src/table/Cargo.toml index a8127f50..c794c924 100644 --- a/src/table/Cargo.toml +++ b/src/table/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_table" -version = "0.8.1" +version = "0.8.2" authors = ["Alex Auvolat <alex@adnab.me>"] edition = "2018" license = "AGPL-3.0" @@ -14,9 +14,9 @@ path = "lib.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -garage_db = { version = "0.8.1", path = "../db" } -garage_rpc = { version = "0.8.1", path = "../rpc" } -garage_util = { version = "0.8.1", path = "../util" } +garage_db = { version = "0.8.2", path = "../db" } +garage_rpc = { version = "0.8.2", path = "../rpc" } +garage_util = { version = "0.8.2", path = "../util" } opentelemetry = "0.17" diff --git a/src/util/Cargo.toml b/src/util/Cargo.toml index 9c182fd6..2e6231f6 100644 --- a/src/util/Cargo.toml +++ b/src/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_util" -version = "0.8.1" +version = "0.8.2" authors = ["Alex Auvolat <alex@adnab.me>"] edition = "2018" license = "AGPL-3.0" @@ -14,7 +14,7 @@ path = "lib.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -garage_db = { version = "0.8.1", path = "../db" } +garage_db = { version = "0.8.2", path = "../db" } arc-swap = "1.0" async-trait = "0.1" diff --git a/src/web/Cargo.toml b/src/web/Cargo.toml index 19eaed17..d0a23af4 100644 --- a/src/web/Cargo.toml +++ b/src/web/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_web" -version = "0.8.1" +version = "0.8.2" authors = ["Alex Auvolat <alex@adnab.me>", "Quentin Dufour <quentin@dufour.io>"] edition = "2018" license = "AGPL-3.0" @@ -14,10 +14,10 @@ path = "lib.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -garage_api = { version = "0.8.1", path = "../api" } -garage_model = { version = "0.8.1", path = "../model" } -garage_util = { version = "0.8.1", path = "../util" } -garage_table = { version = "0.8.1", path = "../table" } +garage_api = { version = "0.8.2", path = "../api" } +garage_model = { version = "0.8.2", path = "../model" } +garage_util = { version = "0.8.2", path = "../util" } +garage_table = { version = "0.8.2", path = "../table" } err-derive = "0.3" tracing = "0.1" |