aboutsummaryrefslogtreecommitdiff
path: root/src/utils/mod.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/utils/mod.rs')
-rw-r--r--src/utils/mod.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
index 89b124f..bc46f4c 100644
--- a/src/utils/mod.rs
+++ b/src/utils/mod.rs
@@ -379,9 +379,9 @@ pub fn make_deploy_data<'a, 's>(
debug_logs: bool,
log_dir: Option<&'a str>,
) -> DeployData<'a> {
- let mut merged_settings = top_settings.clone();
+ let mut merged_settings = profile.generic_settings.clone();
merged_settings.merge(node.generic_settings.clone());
- merged_settings.merge(profile.generic_settings.clone());
+ merged_settings.merge(top_settings.clone());
if cmd_overrides.ssh_user.is_some() {
merged_settings.ssh_user = cmd_overrides.ssh_user.clone();