rallytime 13e8124031 Merge branch '2017.7' into '2018.3' ... Due to the many merge conflicts created from #47106 against the 2017.7 branch and #46002 against the 2018.3 branch, the changes from #47106 have been largely removed from this merge forward and the HEAD of 2018.3 was taken. A separate fix for Tornado 5.0 support will need to be made directly against the 2018.3 branch. Conflicts: - doc/topics/development/conventions/formulas.rst - salt/master.py - salt/minion.py - salt/netapi/rest_tornado/saltnado.py - salt/states/zfs.py - salt/transport/ipc.py - salt/transport/tcp.py - salt/transport/zeromq.py - salt/utils/async.py - tests/support/helpers.py - tests/support/parser/cover.py - tests/unit/grains/test_core.py - tests/unit/modules/test_ssh.py - tests/unit/test_minion.py - tests/unit/utils/test_safe_walk.py		2018-04-27 13:38:35 -04:00
..
ext	Use bytestrings for struct.pack/unpack	2018-01-27 17:34:16 -06:00
parser	Merge branch '2017.7' into '2018.3'	2018-04-27 13:38:35 -04:00
__init__.py	Moved some test supporting modules to tests/support	2017-02-28 22:52:48 +00:00
case.py	Merge branch '2017.7' into '2018.3'	2018-04-27 13:38:35 -04:00
cherrypy_testclasses.py	Use setUpClass instead of __init__	2017-04-28 13:33:37 +01:00
copyartifacts.py	Replace yaml usage with a helper to ensure unicode is handled properly	2018-01-03 14:14:21 -06:00
cptestcase.py	Replace all usage of six.b	2018-01-24 09:17:28 -06:00
docker.py	[PY3] Add print_function import to files with unicode_literals already added	2017-12-15 12:14:18 -06:00
gitfs.py	[PY3] Add unicode_literals to ext_pillar modules	2018-01-04 08:46:40 -06:00
helpers.py	Merge branch '2017.7' into '2018.3'	2018-04-27 13:38:35 -04:00
jinja_filters.py	Fixing test_path_which to check that the filter is available rather than results.	2018-04-11 08:19:07 -07:00
mixins.py	Merge branch '2017.7' into '2018.3'	2018-04-27 13:38:35 -04:00
mock.py	Use mock 2.0.0 instead of unittest.mock on Python 3 (#2)	2018-02-13 20:16:03 +01:00
napalm.py	import absolute paths	2017-11-29 10:00:41 +11:00
paths.py	Merge branch '2017.7' into '2018.3'	2018-04-10 10:11:35 -04:00
processes.py	Merge pull request #41617 from cro/n_proxy_tests	2017-06-15 12:07:29 -05:00
runtests.py	Replace json module usage with a helper to ensure unicode content is handled properly	2017-12-27 09:30:58 -06:00
unit.py	[PY3] Add print_function import to files with unicode_literals already added	2017-12-15 12:14:18 -06:00
win_installer.py	Use aboslute imports	2018-03-28 22:32:30 -07:00
xmlunit.py	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00