rallytime f078d57b57 Merge branch '2016.3' into 'develop' ... Conflicts: - salt/modules/rabbitmq.py - salt/modules/win_servermanager.py - salt/state.py - salt/states/boto_s3_bucket.py - salt/states/pip_state.py - salt/states/win_servermanager.py - tests/unit/modules/win_servermanager_test.py - tests/unit/states/dockerng_test.py		2016-06-09 13:06:10 -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	Debian installation docs: drop section about community-maintained repository	2016-06-02 17:50:47 +03: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	2015.8.8 release docs	2016-03-23 14:00:30 -06:00
solaris.rst	Trailing whitespace cleanup	2014-12-11 07:53:19 -08:00
suse.rst	fix osfamily from Suse to SUSE	2016-05-26 22:08:40 -07:00
ubuntu.rst	2015.8.8 release docs	2016-03-23 14:00:30 -06:00
windows.rst	Fix typo directorys -> directories	2016-04-04 14:20:39 +02:00