diff options
author | notgne2 | 2020-12-19 21:10:26 -0700 |
---|---|---|
committer | notgne2 | 2020-12-22 11:36:48 -0700 |
commit | d01eab0e97c87d503e23f56cd9d68286630f1a42 (patch) | |
tree | 331c34db634aaae334d3da7a5da346e456a185e1 | |
parent | 7d4020f1300f076341627785c53dd151fc7d1a61 (diff) |
Fix the order in which settings are merged
Diffstat (limited to '')
-rw-r--r-- | src/utils/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
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(); |