Colton Myers 24d51fb8f1 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: doc/ref/configuration/minion.rst salt/config.py salt/modules/sudo.py tests/integration/states/file.py		2015-07-02 09:46:36 -06:00
..
beacons	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-05-11 11:38:03 -06:00
cloud	Add minimum Python Azure SDK verion to azure docs.	2015-06-25 15:26:50 -06:00
development	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-06-29 16:49:40 -06:00
eauth	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-06-09 11:41:07 -06:00
event	Clarify the nature of auth and start events.	2015-04-24 12:46:32 -06:00
ext_processes	Fixes for doc build errors	2015-05-27 11:40:31 -06:00
highavailability	References to documentation.	2015-06-23 11:40:06 -06:00
installation	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-07-02 09:46:36 -06:00
jobs	Merge pull request #25023 from pengyao/schedule_typo	2015-06-28 07:25:48 -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-develop	2015-06-11 13:15:38 -06:00
netapi	Whitespace cleanup	2014-12-11 07:53:19 -08:00
pillar	s/respctively/respectively	2015-06-23 18:24:06 -07:00
projects	Whitespace cleanup	2014-12-11 07:53:19 -08:00
reactor	Remove overstate documentation	2015-06-12 13:00:08 -06:00
releases	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-07-02 09:46:36 -06:00
sdb	Whitespace cleanup	2014-12-11 07:53:19 -08:00
spm	Add man page for spm, change pillar to .orig	2015-06-30 09:45:13 -06:00
ssh	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-05-11 11:38:03 -06:00
targeting	Merge pull request #23058 from plastikos/improvement-compound_as_list	2015-04-25 10:57:49 -06:00
topology	Fixes for doc build errors	2015-05-27 11:40:31 -06:00
transports	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2	2015-05-29 15:10:13 -06:00
troubleshooting	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-06-09 11:41:07 -06:00
tutorials	broken link, adding /en/latest	2015-06-23 18:02:15 -07:00
virt	Whitespace cleanup	2014-12-11 07:53:19 -08:00
windows	update docs to reflect new win rep changes	2015-06-26 09:58:47 -06:00
yaml	Whitespace cleanup	2014-12-11 07:53:19 -08:00
best_practices.rst	Fixing spacing typo	2015-06-17 14:54:58 -07:00
index.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-06-16 15:13:53 -06:00