rallytime 031a75ca33 Merge branch '2015.8' into '2016.3' ... Conflicts: - Contributing.rst - conf/master - doc/index.rst - doc/man/salt.7 - pkg/suse/README.suse - salt/client/ssh/state.py - salt/minion.py - salt/modules/zypper.py - salt/utils/schedule.py - tests/unit/modules/zypper_test.py		2016-03-02 10:26:13 -07:00
..
arch.rst	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-02-23 14:25:51 -07:00
debian.rst	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
fedora.rst	Minor doc bug fixes	2015-08-19 11:31:26 -06:00
freebsd.rst	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
gentoo.rst	Trailing whitespace cleanup	2014-12-11 07:53:19 -08:00
index.rst	Fixes #31402	2016-02-24 10:30:34 -07:00
openbsd.rst	Add OpenBSD installation documentation to 2015.5 branch	2015-10-20 09:13:28 -06:00
osx.rst	Note change in yosemite max values and warn.	2015-03-12 10:02:53 -06:00
rhel.rst	Fixes #31402	2016-02-24 10:30:34 -07:00
solaris.rst	Trailing whitespace cleanup	2014-12-11 07:53:19 -08:00
suse.rst	Merge branch '2015.8' into '2016.3'	2016-02-25 12:36:22 -07:00
ubuntu.rst	Correct headers in Debian/Ubuntu/SUSE install instructions	2016-02-25 11:51:40 +02:00
windows.rst	Fix typo sofwares -> software	2015-11-04 10:59:22 +01:00