rallytime ed46ce3c74 Merge branch '2018.3' into 'develop' ... Conflicts: - salt/auth/ldap.py - salt/modules/zfs.py - salt/modules/zpool.py - salt/states/cmd.py - salt/utils/schedule.py - tests/integration/scheduler/test_eval.py - tests/integration/scheduler/test_postpone.py - tests/unit/grains/test_core.py		2018-03-02 11:55:06 -05:00
..
autoaccept_grains.rst	Update refrences to Oxygen codename to 2018.3.0	2018-02-21 21:47:41 -06:00
cloud_controller.rst	Broken Fedora cloud image link fixed	2018-02-15 20:27:01 -08:00
cron.rst	Fix invalid Sphinx lexers in docs	2018-02-02 09:21:07 -06:00
docker_sls.rst	Add a release notes reference to the docker-sls tutorial (#37927)	2016-11-28 12:54:17 -07:00
esky.rst	Remove more ":doc:" references from doc/* files	2016-12-15 15:36:44 -07:00
esxi_proxy_minion.rst	Merge branch '2016.11' into 'develop'	2016-12-20 10:03:44 -07:00
firewall.rst	Simplify firewall rules	2018-02-10 06:28:30 +00:00
gitfs.rst	Update refrences to Oxygen codename to 2018.3.0	2018-02-21 21:47:41 -06:00
halite.rst	Remove more ":doc:" references from doc/* files	2016-12-15 15:36:44 -07:00
http.rst	Fix typo for template_dict in http docs	2017-08-07 16:45:42 -04:00
index.rst	Added docs for autoaccepting grains	2017-10-29 13:53:49 +01:00
intro_scale.rst	Fix a couple of small spelling errors	2017-11-07 12:16:28 -07:00
jinja_to_execution_module.rst	Proofread jinja_to_execution_module tutorial (#38720)	2017-01-13 14:53:50 -07:00
libcloud.rst	Update refrences to Oxygen codename to 2018.3.0	2018-02-21 21:47:41 -06:00
lxc.rst	Merge branch '2016.11' into 'develop'	2016-12-20 10:03:44 -07:00
minionfs.rst	Update refrences to Oxygen codename to 2018.3.0	2018-02-21 21:47:41 -06:00
modules.rst	Various doc updates to fix warnings in doc build	2017-02-06 16:56:58 -07:00
multimaster_pki.rst	Remove more ":doc:" references from doc/* files	2016-12-15 15:36:44 -07:00
multimaster.rst	Update minion data cache documentation	2017-03-24 14:25:46 -06:00
packaging_modules.rst	Remove more ":doc:" references from doc/* files	2016-12-15 15:36:44 -07:00
pillar.rst	Add info about top file to pillar walk-through example to include edit.vim	2017-07-24 12:17:41 -06:00
preseed_key.rst	Merge branch '2016.11' into 'develop'	2016-12-20 10:03:44 -07:00
quickstart.rst	Remove more ":doc:" references from doc/* files	2016-12-15 15:36:44 -07:00
rooted.rst	Remove more ":doc:" references from doc/* files	2016-12-15 15:36:44 -07:00
salt_bootstrap.rst	Update salt_boostrap command line help summary	2017-12-01 15:28:09 -05:00
standalone_minion.rst	Add docs about minion config file in standalone minion docs	2016-05-25 11:00:12 -06:00
starting_states.rst	Update "yaml" code-block references with "jinja" where needed	2017-03-15 10:22:19 -06:00
states_pt1.rst	Merge branch '2016.3' into '2016.11'	2016-12-19 14:58:39 -07:00
states_pt2.rst	Remove more ":doc:" references from doc/* files	2016-12-15 15:36:44 -07:00
states_pt3.rst	Update "yaml" code-block references with "jinja" where needed	2017-03-15 10:22:19 -06:00
states_pt4.rst	Update "yaml" code-block references with "jinja" where needed	2017-03-15 10:22:19 -06:00
states_pt5.rst	Merge branch '2015.8' into '2016.3'	2016-03-25 11:47:16 -06:00
syslog_ng-state-usage.rst	Remove ":doc:" references in salt/* files	2016-12-15 14:03:56 -07:00
walkthrough_macosx.rst	Various doc updates to fix warnings in doc build	2017-02-06 16:56:58 -07:00
walkthrough.rst	Various doc updates to fix warnings in doc build	2017-02-06 16:56:58 -07:00
writing_tests.rst	Update existing tests documentation.	2017-03-28 19:04:05 +01:00