aboutsummaryrefslogtreecommitdiff
path: root/src/rpc/system.rs
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2022-08-29 16:44:13 +0200
committerAlex Auvolat <alex@adnab.me>2022-08-29 16:44:13 +0200
commitebc20a879812dda6ab240a134a67b4675e24c435 (patch)
tree62cff73a1d92b5ab3c7d0526bdd854e6b403ea6d /src/rpc/system.rs
parent16f6a1a65d4b973ea13cd00bbfdd7e225041e447 (diff)
parent532eca7ff94e4710283fb38951a349a83654de59 (diff)
downloadgarage-ebc20a879812dda6ab240a134a67b4675e24c435.tar.gz
garage-ebc20a879812dda6ab240a134a67b4675e24c435.zip
Merge branch 'main' into lx-perf-improvements
Diffstat (limited to 'src/rpc/system.rs')
-rw-r--r--src/rpc/system.rs7
1 files changed, 2 insertions, 5 deletions
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> {