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
..
beacons	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
blackout	Documentation rendering fixes (#37543)	2016-11-08 09:42:12 -07:00
cache	Update minion data cache documentation	2017-03-24 14:25:46 -06:00
cloud	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
configuration	Fix all Sphinx warnings	2018-05-31 15:28:25 -05:00
development	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
eauth	Merge branch '2017.7' into 'oxygen'	2018-01-23 13:26:43 -05:00
engines	Enhance engines docs	2017-09-18 13:44:44 -06:00
event	Merge branch '2017.7' into 'oxygen'	2018-01-11 16:00:08 -05:00
execution	Executors documentation.	2017-05-15 11:41:00 +03:00
ext_processes
grains	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
highavailability	Various doc updates to fix warnings in doc build	2017-02-06 16:56:58 -07:00
installation	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
jinja	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
jobs	Merge branch '2017.7' into '2018.3'	2018-03-15 17:22:05 -04:00
master_tops	Update refrences to Oxygen codename to 2018.3.0	2018-02-21 21:47:41 -06:00
mine	Update Nitrogen references to 2017.7.0 in doc/*	2017-06-14 11:36:06 -06:00
netapi	Fix all Sphinx warnings	2018-05-31 15:28:25 -05:00
network_automation	Fix some Nitrogen references still present in develop	2017-07-19 11:16:32 -06:00
orchestrate	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
pillar	Fix all Sphinx warnings	2018-05-31 15:28:25 -05:00
projects	Merge pull request #34025 from rallytime/merge-2016.3	2016-06-15 15:41:00 -04:00
proxyminion	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
reactor	Merge branch '2017.7' into '2018.3'	2018-03-15 17:22:05 -04:00
releases	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
sdb	make vault like all other sdb backends	2018-03-06 10:08:41 -07:00
slots	Fix various spelling mistakes	2018-03-08 19:14:42 +01:00
solaris	add note related to issue #37027	2017-01-06 15:25:51 +01:00
spm	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
ssh	Merge branch '2016.11' into '2017.7'	2017-07-18 09:05:43 -06:00
states	Merge branch '2016.3' into '2016.11'	2016-12-19 14:58:39 -07:00
targeting	Fix all Sphinx warnings	2018-05-31 15:28:25 -05:00
thorium	Merge branch '2017.7' into 'oxygen'	2017-12-11 18:24:41 -05:00
topology	Merge branch '2016.11' into 'develop'	2017-03-28 17:09:30 -06:00
transports	Fix all Sphinx warnings	2018-05-31 15:28:25 -05:00
troubleshooting	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
tutorials	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
utils	Update refrences to Oxygen codename to 2018.3.0	2018-02-21 21:47:41 -06:00
venafi	Fix all Sphinx warnings	2018-05-31 15:28:25 -05:00
virt	Remove more ":doc:" references from doc/* files	2016-12-15 15:36:44 -07:00
windows	Merge branch '2016.11' into '2017.7'	2018-02-20 17:43:33 -05:00
yaml	Various doc updates to fix warnings in doc build	2017-02-06 16:56:58 -07:00
api.rst
best_practices.rst	Fix all Sphinx warnings	2018-05-31 15:28:25 -05:00
hardening.rst
index.rst	Fix all Sphinx warnings	2018-05-31 15:28:25 -05:00
using_salt.rst	Updates man pages (#34756)	2016-07-18 15:36:50 -06:00