Gareth J. Greenaway 6c99cb161f Merge branch '2018.3' into merge-2018.3 ... Conflicts: doc/man/salt-api.1 doc/man/salt-call.1 doc/man/salt-cloud.1 doc/man/salt-cp.1 doc/man/salt-key.1 doc/man/salt-master.1 doc/man/salt-minion.1 doc/man/salt-proxy.1 doc/man/salt-run.1 doc/man/salt-ssh.1 doc/man/salt-syndic.1 doc/man/salt-unity.1 doc/man/salt.1 doc/man/salt.7 doc/man/spm.1 pkg/osx/build_env.sh salt/utils/dns.py tests/integration/netapi/rest_tornado/test_app.py tests/support/case.py tests/unit/utils/test_dns.py		2019-02-11 15:45:43 -08:00
..
schemas	Merge branch '2018.3' into 'develop'	2018-06-06 13:35:36 -04:00
__init__.py	Use pillar roots validation method	2019-01-22 12:19:06 -07:00