From 50096bc460e03194c5f79da3782f5186839ccf57 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Thu, 24 Feb 2022 13:25:28 +0100 Subject: [PATCH] Bump version to 0.7 because of incompatible Netapp --- Cargo.lock | 50 +++++++++++----------- Cargo.nix | 98 +++++++++++++++++++++---------------------- src/admin/Cargo.toml | 4 +- src/api/Cargo.toml | 8 ++-- src/garage/Cargo.toml | 16 +++---- src/model/Cargo.toml | 8 ++-- src/rpc/Cargo.toml | 6 +-- src/rpc/system.rs | 2 +- src/table/Cargo.toml | 6 +-- src/util/Cargo.toml | 2 +- src/web/Cargo.toml | 10 ++--- 11 files changed, 105 insertions(+), 105 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 84fa6b25..3b14c826 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -727,7 +727,7 @@ dependencies = [ [[package]] name = "garage" -version = "0.6.0" +version = "0.7.0" dependencies = [ "async-trait", "aws-sdk-s3", @@ -736,10 +736,10 @@ dependencies = [ "futures-util", "garage_admin", "garage_api", - "garage_model 0.6.0", - "garage_rpc 0.6.0", - "garage_table 0.6.0", - "garage_util 0.6.0", + "garage_model 0.7.0", + "garage_rpc 0.7.0", + "garage_table 0.7.0", + "garage_util 0.7.0", "garage_web", "git-version", "hex", @@ -761,11 +761,11 @@ dependencies = [ [[package]] name = "garage_admin" -version = "0.6.0" +version = "0.7.0" dependencies = [ "futures", "futures-util", - "garage_util 0.6.0", + "garage_util 0.7.0", "hex", "http", "hyper", @@ -778,7 +778,7 @@ dependencies = [ [[package]] name = "garage_api" -version = "0.6.0" +version = "0.7.0" dependencies = [ "base64", "bytes 1.1.0", @@ -788,9 +788,9 @@ dependencies = [ "form_urlencoded", "futures", "futures-util", - "garage_model 0.6.0", - "garage_table 0.6.0", - "garage_util 0.6.0", + "garage_model 0.7.0", + "garage_table 0.7.0", + "garage_util 0.7.0", "hex", "hmac", "http", @@ -842,7 +842,7 @@ dependencies = [ [[package]] name = "garage_model" -version = "0.6.0" +version = "0.7.0" dependencies = [ "arc-swap", "async-trait", @@ -850,9 +850,9 @@ dependencies = [ "futures", "futures-util", "garage_model 0.5.1", - "garage_rpc 0.6.0", - "garage_table 0.6.0", - "garage_util 0.6.0", + "garage_rpc 0.7.0", + "garage_table 0.7.0", + "garage_util 0.7.0", "hex", "netapp 0.4.0", "opentelemetry", @@ -895,7 +895,7 @@ dependencies = [ [[package]] name = "garage_rpc" -version = "0.6.0" +version = "0.7.0" dependencies = [ "arc-swap", "async-trait", @@ -903,7 +903,7 @@ dependencies = [ "futures", "futures-util", "garage_admin", - "garage_util 0.6.0", + "garage_util 0.7.0", "gethostname", "hex", "hyper", @@ -944,14 +944,14 @@ dependencies = [ [[package]] name = "garage_table" -version = "0.6.0" +version = "0.7.0" dependencies = [ "async-trait", "bytes 1.1.0", "futures", "futures-util", - "garage_rpc 0.6.0", - "garage_util 0.6.0", + "garage_rpc 0.7.0", + "garage_util 0.7.0", "hexdump", "opentelemetry", "rand 0.8.4", @@ -991,7 +991,7 @@ dependencies = [ [[package]] name = "garage_util" -version = "0.6.0" +version = "0.7.0" dependencies = [ "blake2", "chrono", @@ -1016,14 +1016,14 @@ dependencies = [ [[package]] name = "garage_web" -version = "0.6.0" +version = "0.7.0" dependencies = [ "err-derive 0.3.0", "futures", "garage_api", - "garage_model 0.6.0", - "garage_table 0.6.0", - "garage_util 0.6.0", + "garage_model 0.7.0", + "garage_table 0.7.0", + "garage_util 0.7.0", "http", "hyper", "opentelemetry", diff --git a/Cargo.nix b/Cargo.nix index 7392d20e..65b951ed 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -44,14 +44,14 @@ in { cargo2nixVersion = "0.10.0"; workspace = { - garage_util = rustPackages.unknown.garage_util."0.6.0"; - garage_rpc = rustPackages.unknown.garage_rpc."0.6.0"; - garage_admin = rustPackages.unknown.garage_admin."0.6.0"; - garage_table = rustPackages.unknown.garage_table."0.6.0"; - garage_model = rustPackages.unknown.garage_model."0.6.0"; - garage_api = rustPackages.unknown.garage_api."0.6.0"; - garage_web = rustPackages.unknown.garage_web."0.6.0"; - garage = rustPackages.unknown.garage."0.6.0"; + garage_util = rustPackages.unknown.garage_util."0.7.0"; + garage_rpc = rustPackages.unknown.garage_rpc."0.7.0"; + garage_admin = rustPackages.unknown.garage_admin."0.7.0"; + garage_table = rustPackages.unknown.garage_table."0.7.0"; + garage_model = rustPackages.unknown.garage_model."0.7.0"; + garage_api = rustPackages.unknown.garage_api."0.7.0"; + garage_web = rustPackages.unknown.garage_web."0.7.0"; + garage = rustPackages.unknown.garage."0.7.0"; }; "registry+https://github.com/rust-lang/crates.io-index".aho-corasick."0.7.18" = overridableMkRustCrate (profileName: rec { name = "aho-corasick"; @@ -610,7 +610,7 @@ in registry = "registry+https://github.com/rust-lang/crates.io-index"; src = fetchCratesIo { inherit name version; sha256 = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469"; }; dependencies = { - ${ if hostPlatform.config == "aarch64-apple-darwin" || hostPlatform.parsed.cpu.name == "aarch64" && hostPlatform.parsed.kernel.name == "linux" then "libc" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".libc."0.2.115" { inherit profileName; }; + ${ if hostPlatform.parsed.cpu.name == "aarch64" && hostPlatform.parsed.kernel.name == "linux" || hostPlatform.config == "aarch64-apple-darwin" then "libc" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".libc."0.2.115" { inherit profileName; }; }; }); @@ -1060,9 +1060,9 @@ in }; }); - "unknown".garage."0.6.0" = overridableMkRustCrate (profileName: rec { + "unknown".garage."0.7.0" = overridableMkRustCrate (profileName: rec { name = "garage"; - version = "0.6.0"; + version = "0.7.0"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/garage"); dependencies = { @@ -1070,13 +1070,13 @@ in bytes = rustPackages."registry+https://github.com/rust-lang/crates.io-index".bytes."1.1.0" { inherit profileName; }; futures = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.17" { inherit profileName; }; futures_util = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.17" { inherit profileName; }; - garage_admin = rustPackages."unknown".garage_admin."0.6.0" { inherit profileName; }; - garage_api = rustPackages."unknown".garage_api."0.6.0" { inherit profileName; }; - garage_model = rustPackages."unknown".garage_model."0.6.0" { inherit profileName; }; - garage_rpc = rustPackages."unknown".garage_rpc."0.6.0" { inherit profileName; }; - garage_table = rustPackages."unknown".garage_table."0.6.0" { inherit profileName; }; - garage_util = rustPackages."unknown".garage_util."0.6.0" { inherit profileName; }; - garage_web = rustPackages."unknown".garage_web."0.6.0" { inherit profileName; }; + garage_admin = rustPackages."unknown".garage_admin."0.7.0" { inherit profileName; }; + garage_api = rustPackages."unknown".garage_api."0.7.0" { inherit profileName; }; + garage_model = rustPackages."unknown".garage_model."0.7.0" { inherit profileName; }; + garage_rpc = rustPackages."unknown".garage_rpc."0.7.0" { inherit profileName; }; + garage_table = rustPackages."unknown".garage_table."0.7.0" { inherit profileName; }; + garage_util = rustPackages."unknown".garage_util."0.7.0" { inherit profileName; }; + garage_web = rustPackages."unknown".garage_web."0.7.0" { inherit profileName; }; git_version = rustPackages."registry+https://github.com/rust-lang/crates.io-index".git-version."0.3.5" { inherit profileName; }; hex = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }; sodiumoxide = rustPackages."registry+https://github.com/rust-lang/crates.io-index".kuska-sodiumoxide."0.2.5-0" { inherit profileName; }; @@ -1099,15 +1099,15 @@ in }; }); - "unknown".garage_admin."0.6.0" = overridableMkRustCrate (profileName: rec { + "unknown".garage_admin."0.7.0" = overridableMkRustCrate (profileName: rec { name = "garage_admin"; - version = "0.6.0"; + version = "0.7.0"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/admin"); dependencies = { futures = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.17" { inherit profileName; }; futures_util = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.17" { inherit profileName; }; - garage_util = rustPackages."unknown".garage_util."0.6.0" { inherit profileName; }; + garage_util = rustPackages."unknown".garage_util."0.7.0" { inherit profileName; }; hex = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }; http = rustPackages."registry+https://github.com/rust-lang/crates.io-index".http."0.2.5" { inherit profileName; }; hyper = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hyper."0.14.17" { inherit profileName; }; @@ -1119,9 +1119,9 @@ in }; }); - "unknown".garage_api."0.6.0" = overridableMkRustCrate (profileName: rec { + "unknown".garage_api."0.7.0" = overridableMkRustCrate (profileName: rec { name = "garage_api"; - version = "0.6.0"; + version = "0.7.0"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/api"); dependencies = { @@ -1133,9 +1133,9 @@ in form_urlencoded = rustPackages."registry+https://github.com/rust-lang/crates.io-index".form_urlencoded."1.0.1" { inherit profileName; }; futures = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.17" { inherit profileName; }; futures_util = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.17" { inherit profileName; }; - garage_model = rustPackages."unknown".garage_model."0.6.0" { inherit profileName; }; - garage_table = rustPackages."unknown".garage_table."0.6.0" { inherit profileName; }; - garage_util = rustPackages."unknown".garage_util."0.6.0" { inherit profileName; }; + garage_model = rustPackages."unknown".garage_model."0.7.0" { inherit profileName; }; + garage_table = rustPackages."unknown".garage_table."0.7.0" { inherit profileName; }; + garage_util = rustPackages."unknown".garage_util."0.7.0" { inherit profileName; }; hex = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }; hmac = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hmac."0.10.1" { inherit profileName; }; http = rustPackages."registry+https://github.com/rust-lang/crates.io-index".http."0.2.5" { inherit profileName; }; @@ -1187,9 +1187,9 @@ in }; }); - "unknown".garage_model."0.6.0" = overridableMkRustCrate (profileName: rec { + "unknown".garage_model."0.7.0" = overridableMkRustCrate (profileName: rec { name = "garage_model"; - version = "0.6.0"; + version = "0.7.0"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/model"); dependencies = { @@ -1199,9 +1199,9 @@ in futures = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.17" { inherit profileName; }; futures_util = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.17" { inherit profileName; }; garage_model_050 = rustPackages."registry+https://github.com/rust-lang/crates.io-index".garage_model."0.5.1" { inherit profileName; }; - garage_rpc = rustPackages."unknown".garage_rpc."0.6.0" { inherit profileName; }; - garage_table = rustPackages."unknown".garage_table."0.6.0" { inherit profileName; }; - garage_util = rustPackages."unknown".garage_util."0.6.0" { inherit profileName; }; + garage_rpc = rustPackages."unknown".garage_rpc."0.7.0" { inherit profileName; }; + garage_table = rustPackages."unknown".garage_table."0.7.0" { inherit profileName; }; + garage_util = rustPackages."unknown".garage_util."0.7.0" { inherit profileName; }; hex = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }; netapp = rustPackages."registry+https://github.com/rust-lang/crates.io-index".netapp."0.4.0" { inherit profileName; }; opentelemetry = rustPackages."registry+https://github.com/rust-lang/crates.io-index".opentelemetry."0.17.0" { inherit profileName; }; @@ -1244,9 +1244,9 @@ in }; }); - "unknown".garage_rpc."0.6.0" = overridableMkRustCrate (profileName: rec { + "unknown".garage_rpc."0.7.0" = overridableMkRustCrate (profileName: rec { name = "garage_rpc"; - version = "0.6.0"; + version = "0.7.0"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/rpc"); dependencies = { @@ -1255,8 +1255,8 @@ in bytes = rustPackages."registry+https://github.com/rust-lang/crates.io-index".bytes."1.1.0" { inherit profileName; }; futures = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.17" { inherit profileName; }; futures_util = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.17" { inherit profileName; }; - garage_admin = rustPackages."unknown".garage_admin."0.6.0" { inherit profileName; }; - garage_util = rustPackages."unknown".garage_util."0.6.0" { inherit profileName; }; + garage_admin = rustPackages."unknown".garage_admin."0.7.0" { inherit profileName; }; + garage_util = rustPackages."unknown".garage_util."0.7.0" { inherit profileName; }; gethostname = rustPackages."registry+https://github.com/rust-lang/crates.io-index".gethostname."0.2.1" { inherit profileName; }; hex = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hex."0.4.3" { inherit profileName; }; hyper = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hyper."0.14.17" { inherit profileName; }; @@ -1297,9 +1297,9 @@ in }; }); - "unknown".garage_table."0.6.0" = overridableMkRustCrate (profileName: rec { + "unknown".garage_table."0.7.0" = overridableMkRustCrate (profileName: rec { name = "garage_table"; - version = "0.6.0"; + version = "0.7.0"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/table"); dependencies = { @@ -1307,8 +1307,8 @@ in bytes = rustPackages."registry+https://github.com/rust-lang/crates.io-index".bytes."1.1.0" { inherit profileName; }; futures = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.17" { inherit profileName; }; futures_util = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures-util."0.3.17" { inherit profileName; }; - garage_rpc = rustPackages."unknown".garage_rpc."0.6.0" { inherit profileName; }; - garage_util = rustPackages."unknown".garage_util."0.6.0" { inherit profileName; }; + garage_rpc = rustPackages."unknown".garage_rpc."0.7.0" { inherit profileName; }; + garage_util = rustPackages."unknown".garage_util."0.7.0" { inherit profileName; }; hexdump = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hexdump."0.1.1" { inherit profileName; }; opentelemetry = rustPackages."registry+https://github.com/rust-lang/crates.io-index".opentelemetry."0.17.0" { inherit profileName; }; rand = rustPackages."registry+https://github.com/rust-lang/crates.io-index".rand."0.8.4" { inherit profileName; }; @@ -1348,9 +1348,9 @@ in }; }); - "unknown".garage_util."0.6.0" = overridableMkRustCrate (profileName: rec { + "unknown".garage_util."0.7.0" = overridableMkRustCrate (profileName: rec { name = "garage_util"; - version = "0.6.0"; + version = "0.7.0"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/util"); dependencies = { @@ -1376,18 +1376,18 @@ in }; }); - "unknown".garage_web."0.6.0" = overridableMkRustCrate (profileName: rec { + "unknown".garage_web."0.7.0" = overridableMkRustCrate (profileName: rec { name = "garage_web"; - version = "0.6.0"; + version = "0.7.0"; registry = "unknown"; src = fetchCrateLocal (workspaceSrc + "/src/web"); dependencies = { err_derive = buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".err-derive."0.3.0" { profileName = "__noProfile"; }; futures = rustPackages."registry+https://github.com/rust-lang/crates.io-index".futures."0.3.17" { inherit profileName; }; - garage_api = rustPackages."unknown".garage_api."0.6.0" { inherit profileName; }; - garage_model = rustPackages."unknown".garage_model."0.6.0" { inherit profileName; }; - garage_table = rustPackages."unknown".garage_table."0.6.0" { inherit profileName; }; - garage_util = rustPackages."unknown".garage_util."0.6.0" { inherit profileName; }; + garage_api = rustPackages."unknown".garage_api."0.7.0" { inherit profileName; }; + garage_model = rustPackages."unknown".garage_model."0.7.0" { inherit profileName; }; + garage_table = rustPackages."unknown".garage_table."0.7.0" { inherit profileName; }; + garage_util = rustPackages."unknown".garage_util."0.7.0" { inherit profileName; }; http = rustPackages."registry+https://github.com/rust-lang/crates.io-index".http."0.2.5" { inherit profileName; }; hyper = rustPackages."registry+https://github.com/rust-lang/crates.io-index".hyper."0.14.17" { inherit profileName; }; opentelemetry = rustPackages."registry+https://github.com/rust-lang/crates.io-index".opentelemetry."0.17.0" { inherit profileName; }; @@ -2781,7 +2781,7 @@ in ]; dependencies = { ${ if hostPlatform.parsed.kernel.name == "android" || hostPlatform.parsed.kernel.name == "linux" then "libc" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".libc."0.2.115" { inherit profileName; }; - ${ if hostPlatform.parsed.kernel.name == "dragonfly" || hostPlatform.parsed.kernel.name == "freebsd" || hostPlatform.parsed.kernel.name == "illumos" || hostPlatform.parsed.kernel.name == "netbsd" || hostPlatform.parsed.kernel.name == "openbsd" || hostPlatform.parsed.kernel.name == "solaris" || hostPlatform.parsed.kernel.name == "android" || hostPlatform.parsed.kernel.name == "linux" then "once_cell" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".once_cell."1.8.0" { inherit profileName; }; + ${ if hostPlatform.parsed.kernel.name == "android" || hostPlatform.parsed.kernel.name == "linux" || hostPlatform.parsed.kernel.name == "dragonfly" || hostPlatform.parsed.kernel.name == "freebsd" || hostPlatform.parsed.kernel.name == "illumos" || hostPlatform.parsed.kernel.name == "netbsd" || hostPlatform.parsed.kernel.name == "openbsd" || hostPlatform.parsed.kernel.name == "solaris" then "once_cell" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".once_cell."1.8.0" { inherit profileName; }; ${ if hostPlatform.parsed.cpu.name == "i686" || hostPlatform.parsed.cpu.name == "x86_64" || (hostPlatform.parsed.cpu.name == "aarch64" || hostPlatform.parsed.cpu.name == "armv6l" || hostPlatform.parsed.cpu.name == "armv7l") && (hostPlatform.parsed.kernel.name == "android" || hostPlatform.parsed.kernel.name == "fuchsia" || hostPlatform.parsed.kernel.name == "linux") then "spin" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".spin."0.5.2" { inherit profileName; }; untrusted = rustPackages."registry+https://github.com/rust-lang/crates.io-index".untrusted."0.7.1" { inherit profileName; }; ${ if hostPlatform.parsed.cpu.name == "wasm32" && hostPlatform.parsed.vendor.name == "unknown" && hostPlatform.parsed.kernel.name == "unknown" && hostPlatform.parsed.abi.name == "" then "web_sys" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".web-sys."0.3.56" { inherit profileName; }; @@ -3151,7 +3151,7 @@ in ]; dependencies = { bitflags = rustPackages."registry+https://github.com/rust-lang/crates.io-index".bitflags."1.3.2" { inherit profileName; }; - ${ if hostPlatform.parsed.kernel.name == "android" || hostPlatform.parsed.kernel.name == "linux" then "libc" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".libc."0.2.115" { inherit profileName; }; + ${ if hostPlatform.parsed.kernel.name == "linux" || hostPlatform.parsed.kernel.name == "android" then "libc" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".libc."0.2.115" { inherit profileName; }; ${ if !(hostPlatform.parsed.kernel.name == "linux" || hostPlatform.parsed.kernel.name == "android") then "parking_lot" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".parking_lot."0.11.2" { inherit profileName; }; ${ if !(hostPlatform.parsed.kernel.name == "linux" || hostPlatform.parsed.kernel.name == "android") then "parking_lot_core" else null } = rustPackages."registry+https://github.com/rust-lang/crates.io-index".parking_lot_core."0.8.5" { inherit profileName; }; static_init_macro = buildRustPackages."registry+https://github.com/rust-lang/crates.io-index".static_init_macro."1.0.2" { profileName = "__noProfile"; }; diff --git a/src/admin/Cargo.toml b/src/admin/Cargo.toml index 01c16c57..2db4bb08 100644 --- a/src/admin/Cargo.toml +++ b/src/admin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_admin" -version = "0.6.0" +version = "0.7.0" authors = ["Maximilien Richer "] edition = "2018" license = "AGPL-3.0" @@ -13,7 +13,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.6.0", path = "../util" } +garage_util = { version = "0.7.0", path = "../util" } hex = "0.4" diff --git a/src/api/Cargo.toml b/src/api/Cargo.toml index f39c6d04..d61a986f 100644 --- a/src/api/Cargo.toml +++ b/src/api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_api" -version = "0.6.0" +version = "0.7.0" authors = ["Alex Auvolat "] 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_model = { version = "0.6.0", path = "../model" } -garage_table = { version = "0.6.0", path = "../table" } -garage_util = { version = "0.6.0", path = "../util" } +garage_model = { version = "0.7.0", path = "../model" } +garage_table = { version = "0.7.0", path = "../table" } +garage_util = { version = "0.7.0", path = "../util" } base64 = "0.13" bytes = "1.0" diff --git a/src/garage/Cargo.toml b/src/garage/Cargo.toml index 0e197593..c329c32d 100644 --- a/src/garage/Cargo.toml +++ b/src/garage/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage" -version = "0.6.0" +version = "0.7.0" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" @@ -21,13 +21,13 @@ path = "tests/lib.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -garage_api = { version = "0.6.0", path = "../api" } -garage_model = { version = "0.6.0", path = "../model" } -garage_rpc = { version = "0.6.0", path = "../rpc" } -garage_table = { version = "0.6.0", path = "../table" } -garage_util = { version = "0.6.0", path = "../util" } -garage_web = { version = "0.6.0", path = "../web" } -garage_admin = { version = "0.6.0", path = "../admin" } +garage_api = { version = "0.7.0", path = "../api" } +garage_model = { version = "0.7.0", path = "../model" } +garage_rpc = { version = "0.7.0", path = "../rpc" } +garage_table = { version = "0.7.0", path = "../table" } +garage_util = { version = "0.7.0", path = "../util" } +garage_web = { version = "0.7.0", path = "../web" } +garage_admin = { version = "0.7.0", path = "../admin" } bytes = "1.0" git-version = "0.3.4" diff --git a/src/model/Cargo.toml b/src/model/Cargo.toml index 8083445e..64eae0f4 100644 --- a/src/model/Cargo.toml +++ b/src/model/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_model" -version = "0.6.0" +version = "0.7.0" authors = ["Alex Auvolat "] 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_rpc = { version = "0.6.0", path = "../rpc" } -garage_table = { version = "0.6.0", path = "../table" } -garage_util = { version = "0.6.0", path = "../util" } +garage_rpc = { version = "0.7.0", path = "../rpc" } +garage_table = { version = "0.7.0", path = "../table" } +garage_util = { version = "0.7.0", path = "../util" } garage_model_050 = { package = "garage_model", version = "0.5.1" } async-trait = "0.1.7" diff --git a/src/rpc/Cargo.toml b/src/rpc/Cargo.toml index 19a00a39..c666bd00 100644 --- a/src/rpc/Cargo.toml +++ b/src/rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_rpc" -version = "0.6.0" +version = "0.7.0" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" @@ -14,8 +14,8 @@ path = "lib.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -garage_util = { version = "0.6.0", path = "../util" } -garage_admin = { version = "0.6.0", path = "../admin" } +garage_util = { version = "0.7.0", path = "../util" } +garage_admin = { version = "0.7.0", path = "../admin" } arc-swap = "1.0" bytes = "1.0" diff --git a/src/rpc/system.rs b/src/rpc/system.rs index e4d289ec..57470ef1 100644 --- a/src/rpc/system.rs +++ b/src/rpc/system.rs @@ -38,7 +38,7 @@ const STATUS_EXCHANGE_INTERVAL: Duration = Duration::from_secs(10); const PING_TIMEOUT: Duration = Duration::from_secs(2); /// Version tag used for version check upon Netapp connection -pub const GARAGE_VERSION_TAG: u64 = 0x6761726167650006; // garage 0x0006 +pub const GARAGE_VERSION_TAG: u64 = 0x6761726167650007; // garage 0x0007 /// RPC endpoint used for calls related to membership pub const SYSTEM_RPC_PATH: &str = "garage_rpc/membership.rs/SystemRpc"; diff --git a/src/table/Cargo.toml b/src/table/Cargo.toml index bc09ca7c..ed1a213f 100644 --- a/src/table/Cargo.toml +++ b/src/table/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_table" -version = "0.6.0" +version = "0.7.0" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" @@ -14,8 +14,8 @@ path = "lib.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -garage_rpc = { version = "0.6.0", path = "../rpc" } -garage_util = { version = "0.6.0", path = "../util" } +garage_rpc = { version = "0.7.0", path = "../rpc" } +garage_util = { version = "0.7.0", path = "../util" } opentelemetry = "0.17" diff --git a/src/util/Cargo.toml b/src/util/Cargo.toml index 339fd995..0a81ab4f 100644 --- a/src/util/Cargo.toml +++ b/src/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_util" -version = "0.6.0" +version = "0.7.0" authors = ["Alex Auvolat "] edition = "2018" license = "AGPL-3.0" diff --git a/src/web/Cargo.toml b/src/web/Cargo.toml index 81a8c995..59a1231d 100644 --- a/src/web/Cargo.toml +++ b/src/web/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_web" -version = "0.6.0" +version = "0.7.0" authors = ["Alex Auvolat ", "Quentin Dufour "] 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.6.0", path = "../api" } -garage_model = { version = "0.6.0", path = "../model" } -garage_util = { version = "0.6.0", path = "../util" } -garage_table = { version = "0.6.0", path = "../table" } +garage_api = { version = "0.7.0", path = "../api" } +garage_model = { version = "0.7.0", path = "../model" } +garage_util = { version = "0.7.0", path = "../util" } +garage_table = { version = "0.7.0", path = "../table" } err-derive = "0.3" tracing = "0.1.30"