rallytime 9531ea6ef5 Merge branch '2015.5' into '2015.8' ... Conflicts: - doc/topics/highavailability/index.rst - salt/loader.py - salt/modules/service.py - salt/states/cmd.py - tests/unit/states/cmd_test.py		2016-04-07 16:10:32 -06:00
..
beacons	Fix beacon tutorial docs	2016-03-25 16:31:39 -06:00
cloud	Merge branch '2015.5' into '2015.8'	2016-04-07 16:10:32 -06:00
development	Add some "best practices" information to test documentation	2016-03-28 14:23:42 -06:00
eauth	doc.topics.eauth: clarify client_acl vs eauth	2016-01-25 14:32:34 -07:00
engines	__ops__ to __opts__	2015-10-05 15:00:56 -06:00
event	Fix rendering issues for Cherrypy netapi documentation.	2015-12-21 13:26:02 +01:00
ext_processes	initial engines topic, updates to windows repo docs	2015-10-05 14:22:59 -06:00
highavailability	remove reference to master_alive_check	2016-04-04 13:49:33 -06:00
installation	Fix typo directorys -> directories	2016-04-04 14:20:39 +02:00
jobs	Merge branch '2015.5' into '2015.8'	2016-03-24 15:48:00 -06:00
master_tops	Improve state module docs, replace references to state.highstate/state.sls with state.apply	2016-03-21 22:56:17 -05:00
mine	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
netapi	Update list of netapi clients for autoclass	2016-02-19 13:07:09 -07:00
pillar	Merge branch '2015.5' into '2015.8'	2016-03-24 15:48:00 -06:00
projects	Whitespace cleanup	2014-12-11 07:53:19 -08:00
proxyminion	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
reactor	Merge branch '2015.5' into '2015.8'	2016-03-24 15:48:00 -06:00
releases	Fix typo dont -> don't	2016-04-04 14:56:29 +02:00
sdb	Remove 'experimental' warning from SDB docs.	2016-04-05 09:42:34 -06: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
targeting	Merge branch '2015.5' into '2015.8'	2016-03-24 15:48:00 -06:00
topology	Doc updates	2015-08-14 11:52:19 -06:00
transports	Assorted doc issues	2016-02-24 16:56:52 -07:00
troubleshooting	Merge branch '2015.5' into '2015.8'	2016-03-24 15:48:00 -06:00
tutorials	Improve git_pillar documentation/logging	2016-04-07 09:10:53 -06:00
virt	Fixes #30461	2016-02-16 15:53:35 -07:00
windows	Add documentation for disabled the winrepos	2016-04-01 14:18:31 -06:00
yaml	Whitespace cleanup	2014-12-11 07:53:19 -08:00
best_practices.rst	Add examples of using multiple matching levels to Pillar docs	2015-12-15 14:57:36 -07:00
hardening.rst	Added hardening topic based on the information in Refs #27088	2015-10-06 17:36:54 -06:00
index.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-06-16 15:13:53 -06:00