rallytime d83727fdf9 Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/cli/api.py - salt/client/ssh/wrapper/state.py - salt/config/__init__.py - salt/crypt.py - salt/daemons/masterapi.py - salt/key.py - salt/loader.py - salt/master.py - salt/modules/archive.py - salt/modules/hipchat.py - salt/modules/pip.py - salt/modules/state.py - salt/modules/virt.py - salt/modules/x509.py - salt/state.py - salt/transport/tcp.py - salt/transport/zeromq.py - salt/utils/__init__.py - salt/utils/event.py - salt/utils/extmods.py - salt/utils/files.py - salt/utils/parsers.py - salt/utils/verify.py - tests/integration/shell/test_call.py - tests/unit/utils/test_args.py		2018-03-06 13:45:59 -05: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	Distinguish between Authorization and Authentication errors	2018-01-23 17:05:22 -05:00
test_call.py	Merge branch '2017.7' into '2018.3'	2018-03-06 13:45:59 -05:00
test_cloud.py	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
test_cp.py	pass opts to SSHClient for enable_ssh_minions	2018-02-20 16:06:00 -07: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	Replace yaml usage with a helper to ensure unicode is handled properly	2018-01-03 14:14:21 -06:00
test_master_tops.py	Add unicode_literals to tops, thorium, proxy, tokens	2017-12-14 21:56:49 -06:00
test_master.py	Replace yaml usage with a helper to ensure unicode is handled properly	2018-01-03 14:14:21 -06:00
test_matcher.py	Replace yaml usage with a helper to ensure unicode is handled properly	2018-01-03 14:14:21 -06:00
test_minion.py	Replace yaml usage with a helper to ensure unicode is handled properly	2018-01-03 14:14:21 -06:00
test_proxy.py	Add unicode_literals to tops, thorium, proxy, tokens	2017-12-14 21:56:49 -06:00
test_runner.py	Replace yaml usage with a helper to ensure unicode is handled properly	2018-01-03 14:14:21 -06:00
test_saltcli.py	Absolute imports and A LOT of code cleanup.	2017-03-01 01:33:07 +00:00
test_spm.py	fix pylint	2017-12-05 14:39:36 -05:00
test_syndic.py	Replace yaml usage with a helper to ensure unicode is handled properly	2018-01-03 14:14:21 -06:00