rallytime 4abfd26e86 Merge branch '2017.7' into '2018.3' ... Conflicts: - requirements/dev_python27.txt - requirements/dev_python34.txt - salt/fileclient.py - salt/output/__init__.py - salt/serializers/configparser.py - salt/states/pkg.py - salt/states/zpool.py - salt/transport/tcp.py - tests/integration/cloud/providers/test_ec2.py - tests/integration/modules/test_mac_user.py - tests/integration/modules/test_pip.py - tests/integration/modules/test_pkg.py - tests/integration/modules/test_service.py - tests/integration/states/test_pip_state.py - tests/integration/states/test_user.py - tests/unit/modules/test_cmdmod.py		2018-05-23 12:33:00 -04:00
..
autosign_grains	Fix typo	2017-10-29 14:02:40 +01:00
conf	Merge branch '2017.7' into '2018.3'	2018-05-23 12:33:00 -04:00
engines	add io_loop handling to runtests engine	2018-04-28 11:16:26 -05:00
ext-conf	Move sshd_config file to another directory to avoid problems.	2014-05-12 19:06:09 +01:00
extension_modules	Add unicode_literals to tops, thorium, proxy, tokens	2017-12-14 21:56:49 -06:00
file	Merge branch '2017.7' into '2018.3'	2018-05-23 12:33:00 -04:00
file.replace	Fix tests for #18841.	2014-12-18 01:51:26 +01:00
log_handlers	Use explicit unicode strings + break up salt.utils	2017-08-08 13:33:43 -05:00
over	Remove trailing white spaces in tests files	2016-03-01 17:40:02 +02:00
pillar/base	Add pillar ssh integration tests	2017-11-28 12:19:41 -05:00
saltclass/examples	Fix various spelling mistakes	2018-03-08 19:14:42 +01:00
ssh	Make sure that ssh keys don't get added with incorrect encoding types.	2013-10-15 11:48:28 -06:00
autosign_file	Fix test autosign files by using regexes	2017-10-29 14:02:40 +01:00
ext.yaml	Add backend for initial ext_pillar tests	2012-04-08 21:31:08 -06:00
hosts	Split out integration tests from pure unit tests.	2012-02-20 13:18:13 +01:00
mysql_returner_archiver_data.sql	WIP MySQL returner archiver	2016-08-16 10:33:26 -06:00
reactor-sync-minion.sls	Rewrite the tests_valid_docs test	2017-02-26 12:21:00 -06:00
windows-firewall-winexe.ps1	Adding windows minion tests for salt cloud	2018-03-28 15:16:54 -07:00
windows-firewall.ps1	Fix winrm powershell script	2018-04-12 14:41:19 -06:00