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
..
schemas	Merge branch '2018.3' into 'develop'	2018-06-06 13:35:36 -04:00
__init__.py	Implemented RosterEntryConfig and added unit tests for it	2015-07-28 00:42:55 +01:00