diff options
author | notgne2 | 2020-12-27 12:15:34 -0700 |
---|---|---|
committer | GitHub | 2020-12-27 12:15:34 -0700 |
commit | 4ba83f14ceb7136794e7676b71688b903d2c60ab (patch) | |
tree | bd25d9d395e87f680e5d37d5a4030406e7ceabde /src/utils | |
parent | 91e934fd9e1e06044f75a3e3ad998813c2a90fb5 (diff) | |
parent | ccf5160c1f17b908a29a0b85f424114399a99790 (diff) |
Merge pull request #35 from serokell/notgne2/fix-settings-merge
Fix the order in which settings are merged
Diffstat (limited to 'src/utils')
-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(); |