* upstream/develop: (296 commits)
adding win_timezone unit test case
Added autosummary placeholders for new models
Added new modules to the module indexes
i always forget these...
send functions into the beacon loader
Send execution modules into the beacons system
Added autosummary generated placeholders for the new module docs
Avoid TypeError if Tornado is not installed
Updated all the module index pages with the latest/newest modules
Added engine modules to modules index in docs
change engine loader to be raw, no filter func
Fix ARN lookup when using IAM roles in boto_iam module
Add Salt engines to zmq
clean up engine init
import engines in core.py
fix main for proc_mgr
hook the engine start into raet
init the engines with a function
Lint fix.
doc fix
...
Backport of 90b481b8 (pull req #21166)
Traceback (most recent call last):
File "/Users/shouse/tmp/venvs/sphinx/lib/python2.7/site-packages/sphinx/cmdline.py", line 245, in main
opts.warningiserror, opts.tags, opts.verbosity, opts.jobs)
File "/Users/shouse/tmp/venvs/sphinx/lib/python2.7/site-packages/sphinx/application.py", line 181, in __init__
self._init_builder(buildername)
File "/Users/shouse/tmp/venvs/sphinx/lib/python2.7/site-packages/sphinx/application.py", line 243, in _init_builder
self.emit('builder-inited')
File "/Users/shouse/tmp/venvs/sphinx/lib/python2.7/site-packages/sphinx/application.py", line 504, in emit
results.append(callback(self, *args))
File "/Users/shouse/tmp/venvs/sphinx/lib/python2.7/site-packages/sphinx/ext/autosummary/__init__.py", line 551, in process_generate_options
base_path=app.srcdir)
File "/Users/shouse/tmp/venvs/sphinx/lib/python2.7/site-packages/sphinx/ext/autosummary/generate.py", line 111, in generate_autosummary_docs
items = find_autosummary_in_files(sources)
File "/Users/shouse/tmp/venvs/sphinx/lib/python2.7/site-packages/sphinx/ext/autosummary/generate.py", line 226, in find_autosummary_in_files
documented.extend(find_autosummary_in_lines(lines, filename=filename))
File "/Users/shouse/tmp/venvs/sphinx/lib/python2.7/site-packages/sphinx/ext/autosummary/generate.py", line 323, in find_autosummary_in_lines
current_module, filename=filename))
File "/Users/shouse/tmp/venvs/sphinx/lib/python2.7/site-packages/sphinx/ext/autosummary/generate.py", line 236, in find_autosummary_in_docstring
real_name, obj, parent, modname = import_by_name(name)
File "/Users/shouse/tmp/venvs/sphinx/lib/python2.7/site-packages/sphinx/ext/autosummary/__init__.py", line 460, in import_by_name
obj, parent, modname = _import_by_name(prefixed_name)
File "/Users/shouse/tmp/venvs/sphinx/lib/python2.7/site-packages/sphinx/ext/autosummary/__init__.py", line 475, in _import_by_name
__import__(modname)
File "/Users/shouse/src/salt/salt/salt/netapi/rest_tornado/__init__.py", line 19, in <module>
if distutils.version.StrictVersion(tornado.version) >= \
File "/usr/local/Cellar/python/2.7.9/Frameworks/Python.framework/Versions/2.7/lib/python2.7/distutils/version.py", line 40, in __init__
self.parse(vstring)
File "/usr/local/Cellar/python/2.7.9/Frameworks/Python.framework/Versions/2.7/lib/python2.7/distutils/version.py", line 105, in parse
match = self.version_re.match(vstring)
TypeError: expected string or buffer
