Merge pull request #22097 from basepi/clean_kwargs_mine

[2015.2] Clean kwargs in mine.send
This commit is contained in:
Thomas S Hatch 2015-03-27 17:34:37 -06:00
commit 2136b3f765

View File

@ -12,6 +12,7 @@ import time
# Import salt libs
import salt.crypt
import salt.payload
import salt.utils
import salt.utils.network
import salt.utils.event
from salt.exceptions import SaltClientError
@ -157,6 +158,7 @@ def send(func, *args, **kwargs):
salt '*' mine.send network.ip_addrs eth0
salt '*' mine.send eth0_ip_addrs mine_function=network.ip_addrs eth0
'''
kwargs = salt.utils.clean_kwargs(**kwargs)
mine_func = kwargs.pop('mine_function', func)
if mine_func not in __salt__:
return False