diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-08-29 16:44:13 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-08-29 16:44:13 +0200 |
| commit | ebc20a879812dda6ab240a134a67b4675e24c435 (patch) | |
| tree | 62cff73a1d92b5ab3c7d0526bdd854e6b403ea6d /src/rpc | |
| parent | 16f6a1a65d4b973ea13cd00bbfdd7e225041e447 (diff) | |
| parent | 532eca7ff94e4710283fb38951a349a83654de59 (diff) | |
| download | garage-ebc20a879812dda6ab240a134a67b4675e24c435.tar.gz garage-ebc20a879812dda6ab240a134a67b4675e24c435.zip | |
Merge branch 'main' into lx-perf-improvements
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/rpc/system.rs | 7 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/rpc/Cargo.toml b/src/rpc/Cargo.toml index 73328993..80a1975c 100644 --- a/src/rpc/Cargo.toml +++ b/src/rpc/Cargo.toml @@ -19,7 +19,6 @@ garage_util = { version = "0.7.0", path = "../util" } arc-swap = "1.0" bytes = "1.0" gethostname = "0.2" -git-version = "0.3.4" hex = "0.4" tracing = "0.1.30" rand = "0.8" diff --git a/src/rpc/system.rs b/src/rpc/system.rs index f9f2970b..fbfbbf56 100644 --- a/src/rpc/system.rs +++ b/src/rpc/system.rs @@ -27,6 +27,7 @@ use garage_util::data::*; use garage_util::error::*; use garage_util::persister::Persister; use garage_util::time::*; +use garage_util::version; use crate::consul::*; #[cfg(feature = "kubernetes-discovery")] @@ -320,11 +321,7 @@ impl System { // also available through RPC) ---- pub fn garage_version(&self) -> &'static str { - option_env!("GIT_VERSION").unwrap_or(git_version::git_version!( - prefix = "git:", - cargo_prefix = "cargo:", - fallback = "unknown" - )) + version::garage() } pub fn get_known_nodes(&self) -> Vec<KnownNodeInfo> { |