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

Merge pull request #42770 from rallytime/merge-2017.7.1-into-2017.7

Browse source 
[2017.7] Merge forward from 2017.7.1 to 2017.7
This commit is contained in:
Nicole Thomas 2017-08-07 12:21:44 -04:00 • committed by GitHub
commit 9a8c9ebffc
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/netapi/rest_tornado/__init__.py
View file

@ -115,6 +115,7 @@ def start():
ssl_opts.update({'keyfile': mod_opts['ssl_key']})
kwargs['ssl_options'] = ssl_opts
import tornado.httpserver
http_server = tornado.httpserver.HTTPServer(get_application(__opts__), **kwargs)
try:
http_server.bind(mod_opts['port'],

2
salt/utils/reactor.py
View file

@ -273,6 +273,8 @@ class ReactWrap(object):
try:
f_call = salt.utils.format_call(l_fun, low)
kwargs = f_call.get('kwargs', {})
if 'arg' not in kwargs:
kwargs['arg'] = []
if 'kwarg' not in kwargs:
kwargs['kwarg'] = {}