Colton Myers 28b40de8da Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: salt/client/ssh/__init__.py salt/client/ssh/ssh_py_shim.py salt/cloud/clouds/ec2.py salt/cloud/clouds/vmware.py salt/grains/philips_hue.py salt/modules/boto_ec2.py salt/modules/boto_route53.py salt/modules/dracr.py salt/modules/philips_hue.py salt/proxy/philips_hue.py salt/states/virtualenv_mod.py		2015-11-24 16:07:31 -07:00
..
beacons	Documentation for disable_during_state_run	2015-11-02 11:00:33 -05:00
cloud	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-11-24 16:07:31 -07:00
development	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-11-24 16:07:31 -07:00
eauth	Update index.rst	2015-10-28 15:43:47 -07:00
engines	__ops__ to __opts__	2015-10-05 15:00:56 -06:00
event	Deprecate client_acl with publisher_acl (rename)	2015-10-23 11:59:40 +03:00
ext_processes	initial engines topic, updates to windows repo docs	2015-10-05 14:22:59 -06:00
highavailability	Fix typos of parameter	2015-11-04 10:59:22 +01:00
installation	Fix typo sofwares -> software	2015-11-04 10:59:22 +01: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	Fix Doc in jinja template,	2015-10-19 11:59:26 +02: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-20 14:47:49 -06:00
projects	Whitespace cleanup	2014-12-11 07:53:19 -08:00
proxyminion	Add doc and test support	2015-11-19 12:51:45 -05: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-11-24 16:07:31 -07: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-11-13 15:18:45 -07:00
ssh	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-10-07 13:14:28 -06:00
targeting	Fixed nodegroup doc formatting to correctly link to pillar_opts in the master config	2015-10-30 12:41:00 -07:00
topology	[doc] topology / proxyminions fix typos	2015-08-19 14:03:14 +02:00
transports	Fix typo an recieved -> received	2015-11-04 10:59:22 +01:00
troubleshooting	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-11-13 15:18:45 -07:00
tutorials	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-11-24 16:07:31 -07:00
virt	Whitespace cleanup	2014-12-11 07:53:19 -08:00
windows	Fix winrepo command in windows pkg mgmt doc	2015-11-15 20:03:46 -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-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