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
..
all	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
aggregate.rst	Adjust test mocking to handle __utils__['state.check_result']	2017-09-01 16:09:59 -04:00
altering_states.rst
backup_mode.rst	Remove ":doc:" references in salt/* files	2016-12-15 14:03:56 -07:00
compiler_ordering.rst	Fix all Sphinx warnings	2018-05-31 15:28:25 -05:00
extend.rst	Fix 'if if' pattern in docs and comments	2016-09-28 13:12:44 +03:00
failhard.rst
global_state_arguments.rst
highstate.rst	Remove ":doc:" references from a bunch of doc/* files	2016-12-15 16:09:27 -07:00
include.rst	Remove ":doc:" references from all doc/topics/releases/* files	2016-12-15 16:45:51 -07:00
index.rst	docs: fix typo in states/index.rst	2017-03-30 04:41:04 -07:00
layers.rst	Merge branch '2015.5' into '2015.8'	2016-03-24 15:48:00 -06:00
master_side.rst
ordering.rst	doc.ref.states.ordering: clarify requisite change (#32934)	2016-04-28 15:41:01 -06:00
parallel.rst	Fix all Sphinx warnings	2018-05-31 15:28:25 -05:00
providers.rst	Remove more ":doc:" references from doc/* files	2016-12-15 15:36:44 -07:00
requisites.rst	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00
startup.rst	Improve state module docs, replace references to state.highstate/state.sls with state.apply	2016-03-21 22:56:17 -05:00
testing.rst	Improve state module docs, replace references to state.highstate/state.sls with state.apply	2016-03-21 22:56:17 -05:00
top.rst	Fix all Sphinx warnings	2018-05-31 15:28:25 -05:00
vars.rst	documentation fix issue 31844	2016-03-29 09:11:29 -06:00
writing.rst	Merge branch '2017.7' into '2018.3'	2018-06-01 14:54:12 -04:00