Skip to content

Commit

Permalink
Merge pull request #218 from faithanalog/master
Browse files Browse the repository at this point in the history
actually merge confirm_timeout into merged_settings
  • Loading branch information
rvem committed Jun 14, 2023
2 parents 65211db + f28f8c6 commit 724463b
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,10 @@ pub fn init_logger(
Ok(())
}

pub mod cli;
pub mod data;
pub mod deploy;
pub mod push;
pub mod cli;

#[derive(Debug)]
pub struct CmdOverrides {
Expand Down Expand Up @@ -441,6 +441,9 @@ pub fn make_deploy_data<'a, 's>(
if let Some(magic_rollback) = cmd_overrides.magic_rollback {
merged_settings.magic_rollback = Some(magic_rollback);
}
if let Some(confirm_timeout) = cmd_overrides.confirm_timeout {
merged_settings.confirm_timeout = Some(confirm_timeout);
}

DeployData {
node_name,
Expand Down

0 comments on commit 724463b

Please sign in to comment.