Colton Myers 6537da77fe Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: salt/grains/core.py salt/loader.py salt/minion.py salt/modules/dockerng.py salt/modules/rest_package.py salt/modules/ssh.py salt/modules/state.py salt/modules/timezone.py salt/modules/zypper.py salt/runners/state.py salt/state.py salt/states/virtualenv_mod.py salt/utils/cloud.py		2015-10-13 17:27:48 -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-10-07 13:14:28 -06:00
development	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-10-13 17:27:48 -06:00
eauth	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-08-20 13:31:46 -06:00
engines	__ops__ to __opts__	2015-10-05 15:00:56 -06:00
event	Additions for #24042	2015-07-30 15:43:21 -06:00
ext_processes	initial engines topic, updates to windows repo docs	2015-10-05 14:22:59 -06:00
highavailability	Doc on using syndic with multimaster	2015-07-31 15:25:15 -06:00
installation	Fixed a duplicated link ID	2015-09-29 14:08:48 -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-10-07 12:06:12 -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-10-07 12:06:12 -06:00
projects	Whitespace cleanup	2014-12-11 07:53:19 -08:00
proxyminion	Add docs for 2015.8.2+ changes	2015-10-12 14:55:19 -06:00
reactor	Clarify argument usage for runners in reactors	2015-10-09 21:22:54 -07:00
releases	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-10-07 13:14:28 -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-10-07 13:14:28 -06:00
targeting	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-10-07 12:06:12 -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	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-10-07 12:06:12 -06:00
virt	Whitespace cleanup	2014-12-11 07:53:19 -08:00
windows	Updated windows software repository docs	2015-10-01 22:02:01 -06: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-10-07 12:06:12 -06: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