rallytime 201031fa8a Merge branch '2017.7' into '2018.3' ... Conflicts: - doc/man/salt.7 - doc/ref/configuration/minion.rst - salt/cloud/clouds/ec2.py - salt/returners/highstate_return.py - tests/support/gitfs.py - tests/unit/loader/test_loader.py		2018-08-10 13:12:14 -04:00
..
__init__.py	Fix pylint errors in tests	2013-11-27 10:50:55 -07:00
test_highstate_return.py	Update old utils paths to new paths	2018-03-15 17:31:29 -04:00
test_local_cache.py	Update old utils paths to new utils paths	2018-03-27 16:45:16 -04:00
test_sentry.py	[PY3] Add unicode_literals to renderers and returners	2017-12-15 00:17:26 -06:00
test_smtp_return.py	Merge branch '2017.7' into '2018.3'	2018-08-10 13:12:14 -04:00
test_syslog_return.py	Skip test when syslog not available	2018-07-23 23:11:42 -07:00
test_telegram_return.py	Updated Telegram returner test	2017-11-20 10:41:08 +01:00