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
..
rescape	Support Jinja imports with relative paths. Issue #13889	2018-05-04 17:14:01 -06:00