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

Revert 7058f10 / 3df6fa7

Browse Source 
The previous behavior was expected, this change should not have been
made.
This commit is contained in:
Erik Johnson 2018-06-15 10:31:18 -05:00
parent c05c176782
commit 35e5492fb7
No known key found for this signature in database
GPG Key ID: 5E5583C437808F3F
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
salt/state.py
View File

@ -3007,7 +3007,6 @@ class BaseHighState(object):
'top_file_merging_strategy set to \'same\', but no ' 'top_file_merging_strategy set to \'same\', but no '
'default_top configuration option was set' 'default_top configuration option was set'
) )
self.opts['saltenv'] = self.opts['default_top']
if self.opts['saltenv']: if self.opts['saltenv']:
contents = self.client.cache_file( contents = self.client.cache_file(