Erik Johnson 80dcb44a0d Merge remote-tracking branch 'upstream/2018.3' into merge-fluorine ... Conflicts: - salt/utils/mac_utils.py - tests/unit/config/test_config.py - tests/unit/loader/test_globals.py - tests/unit/ssh/test_ssh.py - tests/unit/templates/test_jinja.py - tests/unit/utils/vmware/test_host.py - tests/unit/utils/vmware/test_license.py		2018-08-17 07:52:59 -05: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	Merge branch '2018.3' into 'develop'	2018-04-05 13:25:46 -04:00
test_pgjsonb_return.py	Removing unused imports. Fixing function return.	2018-05-01 16:07:40 -07:00
test_sentry_return.py	Rename sentry returner test to match naming convention	2018-08-14 13:53:29 -05: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