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
..
index.rst	Corect and add the cimc proxy module to autodoc	2018-04-04 15:07:32 +00:00
salt.proxy.chronos.rst	Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron	2016-01-19 21:57:45 -07:00
salt.proxy.cimc.rst	Corect and add the cimc proxy module to autodoc	2018-04-04 15:07:32 +00:00
salt.proxy.cisconso.rst	Cisco NSO Proxy Minion (#32911)	2016-04-29 14:10:23 -06:00
salt.proxy.dummy.rst	Add new documenation file references to build system for 2017.7	2017-06-16 21:17:33 +00:00
salt.proxy.esxi.rst	Fix-up autodoc proxy modules for consistency	2016-01-28 12:33:07 -07:00
salt.proxy.fx2.rst	Fix-up autodoc proxy modules for consistency	2016-01-28 12:33:07 -07:00
salt.proxy.junos.rst	Fix-up autodoc proxy modules for consistency	2016-01-28 12:33:07 -07:00
salt.proxy.marathon.rst	Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron	2016-01-19 21:57:45 -07:00
salt.proxy.napalm.rst	Fix all Sphinx warnings	2018-05-31 15:28:25 -05:00
salt.proxy.nxos.rst	Refreshes the doc module list	2016-04-14 15:28:18 -06:00
salt.proxy.panos.rst	Correct & add Panos to autodoc	2018-04-04 15:07:32 +00:00
salt.proxy.philips_hue.rst	Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron	2016-01-19 21:57:45 -07:00
salt.proxy.rest_sample.rst	Fix-up autodoc proxy modules for consistency	2016-01-28 12:33:07 -07:00
salt.proxy.ssh_sample.rst	Fix-up autodoc proxy modules for consistency	2016-01-28 12:33:07 -07:00