Merge branch '2019.2.1' into 2019.2.1

This commit is contained in:
tanlingyun2005 2019-04-26 12:21:19 +08:00 committed by GitHub
commit cb7742ec4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -55,7 +55,7 @@ def returner(ret):
'''
Write the return data to a file on the minion.
'''
opts = _get_options({}) # Pass in empty ret, since this is a list of events
opts = _get_options(ret)
try:
with salt.utils.files.flopen(opts['filename'], 'a') as logfile:
salt.utils.json.dump(ret, logfile)