valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed incorrect default config

Browse Source
This commit is contained in:
Mike Place 2015-08-06 13:51:37 -06:00
parent e1dd521d57
commit 49fa9df121
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/master
View File

@ -423,8 +423,8 @@
# When using multiple environments, each with their own top file, the
# 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 False
# top_file_merge: True
# requested environment, set this value to 'same'.
# 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