rallytime 3e6445a9d6 Merge branch '2017.7' into '2018.3' ... Conflicts: - doc/man/salt-api.1 - doc/man/salt-call.1 - doc/man/salt-cloud.1 - doc/man/salt-cp.1 - doc/man/salt-key.1 - doc/man/salt-master.1 - doc/man/salt-minion.1 - doc/man/salt-proxy.1 - doc/man/salt-run.1 - doc/man/salt-ssh.1 - doc/man/salt-syndic.1 - doc/man/salt-unity.1 - doc/man/salt.1 - doc/man/salt.7 - doc/man/spm.1 - salt/beacons/log.py - salt/client/ssh/__init__.py - salt/modules/cmdmod.py - salt/utils/win_functions.py - tests/integration/modules/test_cmdmod.py - tests/integration/netapi/rest_tornado/test_app.py - tests/integration/runners/test_state.py		2018-08-08 13:31:57 -04:00
..
__init__.py	Include the python encoding file header on tests.	2013-11-27 11:19:24 +00:00
test_arguments.py	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
test_auth.py	Update old utils paths to new paths	2018-04-03 14:46:56 -04:00
test_call.py	Merge branch '2017.7' into '2018.3'	2018-08-08 13:31:57 -04:00
test_cloud.py	Fix all Sphinx warnings	2018-05-31 15:28:25 -05:00
test_cp.py	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
test_enabled.py	Update all references for moved functions to use "files" util	2017-07-18 10:31:01 -06:00
test_key.py	Fix integration.shell.test_key and integration.shell.test_runner	2018-06-18 17:39:35 +03:00
test_master_tops.py	Add unicode_literals to tops, thorium, proxy, tokens	2017-12-14 21:56:49 -06:00
test_master.py	Merge branch '2017.7' into '2018.3'	2018-07-31 18:18:58 -04:00
test_matcher.py	Merge branch '2017.7' into '2018.3'	2018-08-08 13:31:57 -04:00
test_minion.py	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
test_proxy.py	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
test_runner.py	Fix integration.shell.test_key and integration.shell.test_runner	2018-06-18 17:39:35 +03:00
test_saltcli.py	Fix all Sphinx warnings	2018-05-31 15:28:25 -05:00
test_spm.py	fix pylint	2017-12-05 14:39:36 -05:00
test_syndic.py	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00