rallytime 3273bbdab7 Merge branch '2017.7' into '2018.3' ... Conflicts: - doc/ref/configuration/master.rst - doc/ref/modules/all/index.rst - doc/topics/grains/index.rst - doc/topics/releases/2016.3.4.rst - doc/topics/spm/spm_formula.rst - doc/topics/tutorials/cron.rst - doc/topics/tutorials/index.rst - doc/topics/tutorials/stormpath.rst - salt/engines/slack.py - salt/log/handlers/fluent_mod.py - salt/modules/cyg.py - salt/modules/junos.py - salt/modules/namecheap_dns.py - salt/modules/namecheap_domains.py - salt/modules/namecheap_ns.py - salt/modules/namecheap_ssl.py - salt/modules/namecheap_users.py - salt/modules/reg.py - salt/modules/tomcat.py - salt/modules/vault.py - salt/modules/win_file.py - salt/modules/zpool.py - salt/output/highstate.py - salt/renderers/pass.py - salt/runners/cache.py - salt/states/boto_apigateway.py - salt/states/boto_iam.py - salt/states/boto_route53.py - salt/states/msteams.py - salt/states/reg.py - salt/states/win_iis.py - tests/integration/modules/test_cmdmod.py - tests/integration/states/test_user.py - tests/support/helpers.py - tests/unit/cloud/clouds/test_openstack.py - tests/unit/fileserver/test_gitfs.py - tests/unit/modules/test_junos.py - tests/unit/pillar/test_git.py - tests/unit/states/test_win_path.py - tests/unit/test_pillar.py - tests/unit/utils/test_format_call.py - tests/unit/utils/test_utils.py - tests/unit/utils/test_warnings.py		2018-06-01 14:54:12 -04:00
..
__init__.py	Renamed vmware_test folder to vmware to follow new naming standard	2017-07-17 13:12:34 -04:00
test_cluster.py	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
test_common.py	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
test_connection.py	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
test_datacenter.py	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
test_dvs.py	Update tests for vmware utils	2018-01-22 08:41:54 -06:00
test_host.py	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
test_license.py	Update tests for vmware utils	2018-01-22 08:41:54 -06:00
test_storage.py	Update tests for vmware utils	2018-01-22 08:41:54 -06:00
test_vm.py	Update tests for vmware utils	2018-01-22 08:41:54 -06:00