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
..
conventions	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
extend	Fix all Sphinx warnings	2018-05-31 15:28:25 -05:00
git	Remove repeated words in docs (#37871)	2016-11-23 14:53:17 -07:00
raet
tests	Merge branch '2017.7' into '2018.3'	2018-03-15 17:22:05 -04:00
architecture.rst	Merge pull request #44275 from rallytime/arch-doc	2017-10-31 10:49:41 -06:00
contributing.rst	Merge branch '2017.7' into '2018.3'	2018-04-27 13:38:35 -04:00
deprecations.rst	Move 4 functions from salt.utils to salt.utils.versions	2017-08-15 12:53:57 -05:00
dunder_dictionaries.rst	Update documentation for __salt__ in SDB modules	2017-12-04 17:41:49 -07:00
external_pillars.rst
hacking.rst	Update hacking.rst	2017-04-05 15:12:08 +10:00
index.rst	Fix all Sphinx warnings	2018-05-31 15:28:25 -05:00
labels.rst	Fix all Sphinx warnings	2018-05-31 15:28:25 -05:00
logging.rst	Remove ":doc:" references from a bunch of doc/* files	2016-12-15 16:09:27 -07:00
modular_systems.rst	Various doc updates to fix warnings in doc build	2017-02-06 16:56:58 -07:00
package_providers.rst	Move 13 functions from salt.utils to salt.utils.data	2017-10-10 17:42:42 -05:00
pull_requests.rst	add pull requests doc	2016-10-21 13:26:18 -06:00
reporting_bugs.rst	Remove ":doc:" references from a bunch of doc/* files	2016-12-15 16:09:27 -07:00
topology.rst
translating.rst
tutorial.rst	Fix all Sphinx warnings	2018-05-31 15:28:25 -05:00