saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Merge pull request #260 from mothbe/master

Browse Source 
typo - top_file_merging_strategy (f_defaults.conf) template
This commit is contained in:
Forrest 2016-10-06 15:56:02 -07:00 committed by GitHub
commit 07aa250925
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/files/master.d/f_defaults.conf
View File

@ -650,7 +650,7 @@ master_tops:
# default behaviour is an unordered merge. To prevent top files from # default behaviour is an unordered merge. To prevent top files from
# being merged together and instead to only use the top file from the # being merged together and instead to only use the top file from the
# requested environment, set this value to 'same'. # 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 # 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 # in the env_order option. Given a conflict, the last matching value will