Browse Source
fix typo for top_file_merging_strategy in salt/files/master.d/f_defaults.conf template
master
Marcin Witowski
8 years ago
1 changed files with 1 additions and 1 deletions
+ 1
- 1
salt/files/master.d/f_defaults.conf
View File
| # 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 |
Loading…