Browse Source

fix typo for top_file_merging_strategy in salt/files/master.d/f_defaults.conf template

tags/v0.57.0
Marcin Witowski 8 years ago
parent
commit
9d0b6b03d8
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      salt/files/master.d/f_defaults.conf

+ 1
- 1
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
# 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

Loading…
Cancel
Save