From d01eab0e97c87d503e23f56cd9d68286630f1a42 Mon Sep 17 00:00:00 2001
From: notgne2
Date: Sat, 19 Dec 2020 21:10:26 -0700
Subject: Fix the order in which settings are merged
---
src/utils/mod.rs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'src/utils')
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
index 5770f98..a891261 100644
--- a/src/utils/mod.rs
+++ b/src/utils/mod.rs
@@ -260,9 +260,9 @@ pub fn make_deploy_data<'a, 's>(
profile_name: &'a str,
cmd_overrides: &'a CmdOverrides,
) -> 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();
--
cgit v1.2.3