From 9d0b6b03d8ee22e46d4469a302ef6ac04db77e57 Mon Sep 17 00:00:00 2001 From: Marcin Witowski Date: Fri, 7 Oct 2016 00:48:59 +0200 Subject: [PATCH] fix typo for top_file_merging_strategy in salt/files/master.d/f_defaults.conf template --- salt/files/master.d/f_defaults.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf index 6550c56..7918fb8 100644 --- a/salt/files/master.d/f_defaults.conf +++ b/salt/files/master.d/f_defaults.conf @@ -650,7 +650,7 @@ master_tops: # default behaviour is an unordered merge. To prevent top files from # being merged together and instead to only use the top file from the # requested environment, set this value to 'same'. -{{ get_config('top_file_merging_stragety', 'merge') }} +{{ get_config('top_file_merging_strategy', 'merge') }} # To specify the order in which environments are merged, set the ordering # in the env_order option. Given a conflict, the last matching value will