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
..
beacons	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
blackout	Add documentation for whitelist	2016-02-03 12:29:11 -07:00
cloud	Merge branch '2015.8' into '2016.3'	2016-03-02 10:26:13 -07:00
configuration	Add minion_blackout documentation	2016-02-03 12:13:15 -07:00
development	Merge branch '2015.8' into '2016.3'	2016-03-08 10:14:32 -07:00
eauth	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
engines	Fix the engines_dirs config option name.	2015-11-26 18:31:20 +00:00
event	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
execution	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
ext_processes	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
grains	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
highavailability	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
installation	Merge branch '2015.8' into '2016.3'	2016-03-02 10:26:13 -07:00
jobs	Merge branch '2015.8' into '2016.3'	2016-03-02 10:26:13 -07:00
master_tops	Whitespace cleanup	2014-12-11 07:53:19 -08:00
mine	Merge branch '2015.8' into '2016.3'	2016-03-02 10:26:13 -07:00
netapi	Merge branch '2015.8' into '2016.3'	2016-02-20 12:27:41 -07:00
orchestrate	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3	2016-02-11 22:33:49 -07:00
pillar	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3	2016-02-11 22:33:49 -07:00
projects	Whitespace cleanup	2014-12-11 07:53:19 -08:00
proxyminion	Merge branch '2015.8' into '2016.3'	2016-03-02 10:26:13 -07:00
reactor	Merge branch '2015.8' into '2016.3'	2016-03-02 10:26:13 -07:00
releases	Add some info about massive improvements for SmartOS, illumos, and Solaris	2016-03-03 20:23:38 +00:00
sdb	Add docs on how to actually use SDB	2016-02-19 11:55:39 -07:00
spm	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
ssh	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
states	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
targeting	Merge branch '2015.8' into '2016.3'	2016-03-02 10:26:13 -07:00
thorium	Add provisional statement to Thorium	2016-02-18 10:47:10 -07:00
topology	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
transports	Merge branch '2015.8' into '2016.3'	2016-02-25 12:36:22 -07:00
troubleshooting	Merge branch '2015.8' into 'develop'	2016-01-26 16:19:39 -07:00
tutorials	Merge branch '2015.8' into '2016.3'	2016-03-08 10:14:32 -07:00
virt	Merge branch '2015.8' into '2016.3'	2016-02-18 11:10:44 -07:00
windows	Fix typos	2016-02-24 10:15:01 -07:00
yaml	Whitespace cleanup	2014-12-11 07:53:19 -08:00
api.rst	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
best_practices.rst	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
hardening.rst	Added hardening topic based on the information in Refs #27088	2015-10-06 17:36:54 -06:00
index.rst	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
using_salt.rst	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00