Colton Myers c8eb2d4665 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: doc/topics/installation/windows.rst salt/cloud/clouds/joyent.py salt/daemons/flo/core.py salt/minion.py		2015-02-23 14:25:51 -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	Comma cleanup	2014-12-12 11:40:10 -08: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	Update index.rst	2015-01-22 19:16:44 -05:00
osx.rst	Trailing whitespace cleanup	2014-12-11 07:53:19 -08: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	Trailing whitespace cleanup	2014-12-11 07:53:19 -08:00
ubuntu.rst	Install remaining core components: salt-cloud, ...	2014-12-29 10:13:13 -08:00
windows.rst	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-02-23 14:25:51 -07:00