Colton Myers 41cad702e3 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: salt/minion.py salt/modules/rest_service.py salt/states/dockerng.py salt/utils/cloud.py		2015-09-29 18:13:33 -06:00
..
beacons	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-09-14 14:39:03 -06:00
cloud	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-09-29 18:13:33 -06:00
development	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-09-29 18:13:33 -06:00
eauth	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-08-20 13:31:46 -06:00
event	Additions for #24042	2015-07-30 15:43:21 -06:00
ext_processes	Fixes for doc build errors	2015-05-27 11:40:31 -06:00
highavailability	Doc on using syndic with multimaster	2015-07-31 15:25:15 -06:00
installation	add FreeBSD documentation to 2015.8.0 notes	2015-09-23 14:03:12 -06:00
jobs	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-09-01 15:35:21 -06:00
master_tops	Whitespace cleanup	2014-12-11 07:53:19 -08:00
mine	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-09-22 15:20:17 -06:00
netapi	Add local_subset client to docs	2015-09-17 18:03:04 -06:00
pillar	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-07-30 16:54:44 -06:00
projects	Whitespace cleanup	2014-12-11 07:53:19 -08:00
proxyminion	Fix typo in docs	2015-09-23 14:11:00 -06:00
reactor	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-09-17 11:10:37 -06:00
releases	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-09-29 18:13:33 -06:00
sdb	Whitespace cleanup	2014-12-11 07:53:19 -08:00
spm	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-09-18 11:03:37 -06:00
ssh	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-09-29 18:13:33 -06:00
targeting	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-08-20 13:31:46 -06:00
topology	[doc] topology / proxyminions fix typos	2015-08-19 14:03:14 +02:00
transports	doc: fix RAET links	2015-09-25 12:16:47 -06:00
troubleshooting	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-06-09 11:41:07 -06:00
tutorials	Fixed sphinx / latex build warnings and errors	2015-09-17 09:23:24 -06:00
virt	Whitespace cleanup	2014-12-11 07:53:19 -08:00
windows	Add link to winrepo.update_git_repos runner function for consistency.	2015-09-09 09:04:52 -05:00
yaml	Whitespace cleanup	2014-12-11 07:53:19 -08:00
best_practices.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-07-20 13:55:14 -06:00
index.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-06-16 15:13:53 -06:00