serokell/deploy-rs
1
1
Fork 0
mirror of https://github.com/serokell/deploy-rs.git synced 2024-09-11 02:35:39 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #218 from faithanalog/master

Browse Source 
actually merge confirm_timeout into merged_settings
This commit is contained in:
Roman Melnikov 2023-06-14 14:52:03 +02:00 committed by GitHub
commit 724463b5a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib.rs
View File

@ -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,