valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13267 from d--j/patch-2

Browse Source 
Copy&Paste error in error message
This commit is contained in:
Thomas S Hatch 2014-06-05 16:43:25 -06:00
commit daba2ff4d8
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/daemons/masterapi.py
View File

@ -698,7 +698,7 @@ class RemoteFuncs(object):
pub_load['timeout'] = int(load['timeout'])
except ValueError:
msg = 'Failed to parse timeout value: {0}'.format(
load['tmo'])
load['timeout'])
log.warn(msg)
return {}
if 'tgt_type' in load: