mirrors/garage
1
0
Fork 0
mirror of https://git.deuxfleurs.fr/Deuxfleurs/garage.git synced 2024-11-21 23:51:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge

Browse source
This commit is contained in:
Alex Auvolat 2022-09-07 18:16:01 +02:00
parent 8adc654713
commit 06df301de5
No known key found for this signature in database
GPG key ID: 0E496D15096376BE
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,7 +1,7 @@
.PHONY: doc all release shell run1 run2 run3 .PHONY: doc all release shell run1 run2 run3
all: all:
clear; cargo build --all-features clear; cargo build
release: release:
nix-build --arg release true nix-build --arg release true

8
src/garage/cli/structs.rs
View file

@ -502,7 +502,7 @@ pub enum WorkerCmd {
opt: WorkerListOpt, opt: WorkerListOpt,
}, },
/// Set worker parameter /// Set worker parameter
#[structopt(name = "set", version = version::garage())] #[structopt(name = "set", version = garage_version())]
Set { Set {
#[structopt(subcommand)] #[structopt(subcommand)]
opt: WorkerSetCmd, opt: WorkerSetCmd,
@ -522,12 +522,12 @@ pub struct WorkerListOpt {
#[derive(Serialize, Deserialize, StructOpt, Debug, Eq, PartialEq, Clone)] #[derive(Serialize, Deserialize, StructOpt, Debug, Eq, PartialEq, Clone)]
pub enum WorkerSetCmd { pub enum WorkerSetCmd {
/// Set tranquility of scrub operations /// Set tranquility of scrub operations
#[structopt(name = "scrub-tranquility", version = version::garage())] #[structopt(name = "scrub-tranquility", version = garage_version())]
ScrubTranquility { tranquility: u32 }, ScrubTranquility { tranquility: u32 },
/// Set number of concurrent block resync workers /// 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 }, ResyncNWorkers { n_workers: usize },
/// Set tranquility of block resync operations /// Set tranquility of block resync operations
#[structopt(name = "resync-tranquility", version = version::garage())] #[structopt(name = "resync-tranquility", version = garage_version())]
ResyncTranquility { tranquility: u32 }, ResyncTranquility { tranquility: u32 },
} }