rallytime 52edbffc85 Merge branch '2016.11' into 'develop' ... Conflicts: - doc/ref/cache/all/index.rst - doc/topics/cache/index.rst - salt/cache/localfs.py - salt/modules/boto_rds.py - salt/roster/cloud.py - salt/states/virtualenv_mod.py - tests/integration/states/test_archive.py - tests/unit/modules/test_dockermod.py - tests/unit/states/dockerng_test.py		2017-03-28 17:09:30 -06:00
..
cloud_controller.rst	Cleaned up language slightly	2017-03-27 17:26:58 -06:00
cron.rst	Remove more ":doc:" references from doc/* files	2016-12-15 15:36:44 -07: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	Updated latest release to 2016.3.1	2016-06-15 11:52:02 -06:00
gitfs.rst	Merge branch '2016.11' into 'develop'	2017-02-22 16:24:36 -07:00
halite.rst	Remove more ":doc:" references from doc/* files	2016-12-15 15:36:44 -07:00
http.rst	Various doc updates to fix warnings in doc build	2017-02-06 16:56:58 -07:00
index.rst	Change OSX/OS X to macOS where possible	2016-12-28 14:49:46 -07:00
intro_scale.rst	Merge branch '2016.3' into '2016.11'	2016-12-19 14:58:39 -07:00
jinja_to_execution_module.rst	Proofread jinja_to_execution_module tutorial (#38720)	2017-01-13 14:53:50 -07:00
lxc.rst	Merge branch '2016.11' into 'develop'	2016-12-20 10:03:44 -07:00
minionfs.rst	Remove more ":doc:" references from doc/* files	2016-12-15 15:36:44 -07: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	Update pillar tutorial lanuage regarding pillar_opts settings	2017-01-17 14:55:17 -07: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	Adjust code examples to use the actual bootstrap-salt.sh file name (#38011)	2016-12-01 09:01:25 -07: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
stormpath.rst	Remove more ":doc:" references from doc/* files	2016-12-15 15:36:44 -07: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