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	Refactor for testing and adding related engine tests	2016-09-19 17:10:19 -07:00
test_libvirt_events.py	Fixing unit.engines.test_libvirt_events.test_event_register to ensure the return value is correct and the engine does not loop forever.	2018-04-25 10:32:40 -07:00
test_slack.py	Rename slack engine test file to respect naming convention	2018-08-14 13:53:29 -05:00
test_sqs_events.py	Add unicode_literals to engines	2018-01-07 14:01:48 -06:00