aboutsummaryrefslogtreecommitdiff
path: root/src/rpc
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2022-08-29 16:45:05 +0200
committerAlex Auvolat <alex@adnab.me>2022-08-29 16:45:05 +0200
commit1921f4f7e65516e04b86f54a298d94259bbd85be (patch)
tree298acee7b6c1143ea70e36cbdcbc94b0ff51af98 /src/rpc
parente935861854deed5d1ca66767fc51d9849201a4dd (diff)
parentebc20a879812dda6ab240a134a67b4675e24c435 (diff)
downloadgarage-1921f4f7e65516e04b86f54a298d94259bbd85be.tar.gz
garage-1921f4f7e65516e04b86f54a298d94259bbd85be.zip
Merge branch 'lx-perf-improvements' into netapp-stream-body
Diffstat (limited to 'src/rpc')
-rw-r--r--src/rpc/Cargo.toml1
-rw-r--r--src/rpc/system.rs7
2 files changed, 2 insertions, 6 deletions
diff --git a/src/rpc/Cargo.toml b/src/rpc/Cargo.toml
index 5986b7bf..6f3c81ed 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 04ef2f69..5858660e 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> {