diff options
author | Roman Melnikov | 2023-06-14 14:52:03 +0200 |
---|---|---|
committer | GitHub | 2023-06-14 14:52:03 +0200 |
commit | 724463b5a94daa810abfc64a4f87faef4e00f984 (patch) | |
tree | d28ae84202e328ef087cff85d9c6748ad9b19080 | |
parent | 65211db63ba1199f09b4c9f27e5eba5ec50d76ac (diff) | |
parent | f28f8c6063dfdee3720a8841cc857df2c911dec8 (diff) |
Merge pull request #218 from faithanalog/master
actually merge confirm_timeout into merged_settings
Diffstat (limited to '')
-rw-r--r-- | src/lib.rs | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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 { @@ -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, |