rallytime 838dc12b77 Merge branch '2015.8' into '2016.3' ... Conflicts: - salt/cli/daemons.py - salt/config/__init__.py - salt/exceptions.py - salt/pillar/foreman.py - salt/returners/local_cache.py - salt/states/saltmod.py - salt/utils/__init__.py - salt/utils/cloud.py The merge conflicts in salt/cli/daemons.py are still present in this commit. @s0undt3ch is going to resolve them after this commit.		2016-03-08 10:14:32 -07:00
..
cloud_controller.rst	Merge branch '2014.7' into develop	2014-12-23 10:57:26 -07:00
cron.rst	Fix trailing whitespace	2014-12-11 07:53:19 -08:00
esky.rst	Fix trailing whitespace	2014-12-11 07:53:19 -08:00
esxi_proxy_minion.rst	Change all relevant Boron references to 2016.3.0	2016-02-10 15:45:28 -07:00
firewall.rst	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
gitfs.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2016-01-05 16:11:20 -07:00
halite.rst	Deprecate Halite from the Salt docs	2015-05-05 16:01:35 -06:00
http.rst	Merge branch '2015.5' into '2015.8'	2016-03-02 12:33:10 -07:00
index.rst	Document new functionality for packaging external modules	2016-02-17 12:15:43 -07:00
intro_scale.rst	Assorted doc issues	2016-02-24 16:56:52 -07:00
lxc.rst	Fix typo doesnt -> doesn't	2016-02-04 12:38:29 +01:00
minionfs.rst	Minor grammar changes to #28271	2015-10-26 06:15:19 -06:00
modules.rst	Fix trailing whitespace	2014-12-11 07:53:19 -08:00
multimaster_pki.rst	Remove debug from docs	2015-07-28 11:35:32 -06:00
multimaster.rst	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-12-18 15:00:24 -07:00
packaging_modules.rst	Document new functionality for packaging external modules	2016-02-17 12:15:43 -07:00
pillar.rst	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2016-01-06 09:30:28 -07:00
preseed_key.rst	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
quickstart.rst	Merge branch '2015.8' into 'develop'	2016-01-26 16:19:39 -07:00
rooted.rst	Fix typo an dont -> don't	2015-11-04 10:59:22 +01:00
salt_bootstrap.rst	Merge branch '2015.8' into '2016.3'	2016-02-18 11:10:44 -07:00
standalone_minion.rst	Bug fixes and build errors	2015-06-05 17:32:35 -06:00
starting_states.rst	Fixes for doc build errors	2015-05-27 11:40:31 -06:00
states_pt1.rst	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
states_pt2.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-10-30 16:05:26 -06:00
states_pt3.rst	Assorted doc bugs	2015-10-05 17:37:13 -06:00
states_pt4.rst	Resolve merge conflicts	2015-02-28 12:35:25 -06:00
states_pt5.rst	Remove overstate docs and a few references.	2016-02-08 09:28:32 -07:00
stormpath.rst	Updates to Stormpath as per Randall Degges	2015-04-22 15:59:09 -06:00
syslog_ng-state-usage.rst	Fix typo an other -> another	2015-11-04 10:59:22 +01:00
walkthrough_macosx.rst	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
walkthrough.rst	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
writing_tests.rst	Some more testing documentation improvements	2016-03-03 16:57:52 -07:00