Gareth J. Greenaway e891b3f515 Merge branch '2018.3.4' into merge-2018.3.4 ... Conflicts: tests/integration/states/test_file.py tests/unit/states/test_file.py tests/unit/utils/test_dns.py		2019-02-11 10:46:53 -08:00
..
autosign_grains	Fix typo	2017-10-29 14:02:40 +01:00
conf	merge-forward 2017.7 to 2018.3	2018-11-19 10:39:38 -08:00
engines	Fix imports	2018-08-10 15:52:01 +02:00
ext-conf	Move sshd_config file to another directory to avoid problems.	2014-05-12 19:06:09 +01:00
extension_modules	Rename some files to avoid them being identified as test modules	2018-08-14 13:53:30 -05:00
file	Merge branch '2018.3.4' into merge-2018.3.4	2019-02-11 10:46:53 -08:00
file.replace	Fix tests for #18841.	2014-12-18 01:51:26 +01:00
log_handlers	Fix linter issues	2018-09-10 10:00:25 -07:00
over	Remove trailing white spaces in tests files	2016-03-01 17:40:02 +02:00
pillar/base	peserve newlines from pillar data for file.managed	2019-01-25 14:42:32 -05:00
saltclass/examples	Add test for issue #48145	2018-06-15 23:48:14 +07: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