diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-09-07 18:16:01 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-09-07 18:16:01 +0200 |
| commit | 06df301de5ab2068ee55c8663eebafb0d9a26978 (patch) | |
| tree | 87e39e1c6b7aa02f44b06b9ed3394cd0c16b698b | |
| parent | 8adc6547132412ef7a43ea4172b2d627c19c38a7 (diff) | |
| download | garage-06df301de5ab2068ee55c8663eebafb0d9a26978.tar.gz garage-06df301de5ab2068ee55c8663eebafb0d9a26978.zip | |
Fix merge
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/garage/cli/structs.rs | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -1,7 +1,7 @@ .PHONY: doc all release shell run1 run2 run3 all: - clear; cargo build --all-features + clear; cargo build release: nix-build --arg release true diff --git a/src/garage/cli/structs.rs b/src/garage/cli/structs.rs index 105e17f8..825fe859 100644 --- a/src/garage/cli/structs.rs +++ b/src/garage/cli/structs.rs @@ -502,7 +502,7 @@ pub enum WorkerCmd { opt: WorkerListOpt, }, /// Set worker parameter - #[structopt(name = "set", version = version::garage())] + #[structopt(name = "set", version = garage_version())] Set { #[structopt(subcommand)] opt: WorkerSetCmd, @@ -522,12 +522,12 @@ pub struct WorkerListOpt { #[derive(Serialize, Deserialize, StructOpt, Debug, Eq, PartialEq, Clone)] pub enum WorkerSetCmd { /// Set tranquility of scrub operations - #[structopt(name = "scrub-tranquility", version = version::garage())] + #[structopt(name = "scrub-tranquility", version = garage_version())] ScrubTranquility { tranquility: u32 }, /// Set number of concurrent block resync workers - #[structopt(name = "resync-n-workers", version = version::garage())] + #[structopt(name = "resync-n-workers", version = garage_version())] ResyncNWorkers { n_workers: usize }, /// Set tranquility of block resync operations - #[structopt(name = "resync-tranquility", version = version::garage())] + #[structopt(name = "resync-tranquility", version = garage_version())] ResyncTranquility { tranquility: u32 }, } |