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
..
arch.rst	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-02-23 14:25:51 -07:00
debian.rst	Fixing more sphinx/docs errors and warnings	2015-05-16 19:24:04 -04:00
fedora.rst	Trailing whitespace cleanup	2014-12-11 07:53:19 -08:00
freebsd.rst	Comma cleanup	2014-12-12 11:40:10 -08:00
gentoo.rst	Trailing whitespace cleanup	2014-12-11 07:53:19 -08:00
index.rst	Add installation doc for OpenBSD.	2015-05-07 09:48:27 +02:00
openbsd.rst	Typo.	2015-05-07 09:51:00 +02:00
osx.rst	Note change in yosemite max values and warn.	2015-03-12 10:02:53 -06:00
rhel.rst	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-02-20 13:51:59 -07:00
solaris.rst	Trailing whitespace cleanup	2014-12-11 07:53:19 -08:00
suse.rst	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5	2015-05-18 17:07:15 -06:00
ubuntu.rst	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-04-29 12:01:52 -06:00
windows.rst	Add download links for 2015.5.1-3 and 2015.5.2, Fixes #25057	2015-06-30 07:48:21 -04:00