saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Correct an inaccurate warning when top_file_merging_strategy == merge_all (#38233)

Browse source 
The merge_all strategy uses all configured SLS files, so there is no
danger from "merging" like there is in the default strategy. Therefore,
this log entry is spurious when multiple top files exist and the merging
strategy is set to "merge_all".
This commit is contained in:
Erik Johnson 2016-12-14 12:08:19 -06:00 • committed by Nicole Thomas
parent ba62fcf2ec
commit 82b1b77631
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/state.py
View file

@ -2586,7 +2586,7 @@ class BaseHighState(object):
tops[saltenv].append({})
log.debug('No contents loaded for env: {0}'.format(saltenv))
if found > 1 and merging_strategy.startswith('merge'):
if found > 1 and merging_strategy == 'merge':
log.warning(
'top_file_merging_strategy is set to \'%s\' and '
'multiple top files were found. Merging order is not '