rallytime 77f8120395 Merge branch '2016.3' into 'carbon' ... Conflicts: - doc/topics/installation/windows.rst - salt/engines/sqs_events.py - salt/grains/core.py		2016-09-21 10:43:38 -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	Updated latest release to 2016.3.1	2016-06-15 11:52:02 -06:00
fedora.rst	Minor doc bug fixes	2015-08-19 11:31:26 -06:00
freebsd.rst	Update freebsd.rst (#35394)	2016-08-11 11:00:36 -06:00
gentoo.rst	Trailing whitespace cleanup	2014-12-11 07:53:19 -08:00
index.rst	Merge pull request #34025 from rallytime/merge-2016.3	2016-06-15 15:41:00 -04:00
openbsd.rst	Add OpenBSD installation documentation to 2015.5 branch	2015-10-20 09:13:28 -06:00
osx.rst	Fix incremental doc builds - OS X, postgres returner, tcp transport doc updates (#35865)	2016-08-31 09:51:36 -06:00
rhel.rst	Update package dep note to systemd-python for RHEL7 install	2016-06-20 08:53:42 -06:00
solaris.rst	Trailing whitespace cleanup	2014-12-11 07:53:19 -08:00
suse.rst	Merge branch '2016.3' into 'develop'	2016-07-18 10:34:03 -06:00
ubuntu.rst	Updated latest release to 2016.3.1	2016-06-15 11:52:02 -06:00
windows.rst	Merge branch '2016.3' into 'carbon'	2016-09-21 10:43:38 -06:00