Colton Myers 000de95974 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: .pylintrc doc/ref/runners/all/salt.runners.nacl.rst doc/topics/cloud/config.rst salt/cli/salt.py salt/client/mixins.py salt/client/ssh/__init__.py salt/loader.py salt/minion.py salt/modules/cassandra_cql.py salt/modules/gpg.py salt/modules/grains.py salt/modules/iptables.py salt/modules/yumpkg.py salt/netapi/rest_cherrypy/app.py salt/renderers/pyobjects.py salt/returners/mysql.py salt/runners/jobs.py salt/state.py salt/states/file.py salt/states/service.py salt/utils/minions.py tests/integration/__init__.py tests/integration/netapi/rest_tornado/test_app.py tests/integration/states/cmd.py		2015-04-16 12:15:44 -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	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	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	Trailing whitespace cleanup	2014-12-11 07:53:19 -08:00
ubuntu.rst	Add documentation for multiple Ubuntu PPAs. Fixes #18822	2015-03-29 00:31:07 -07:00
windows.rst	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-04-16 12:15:44 -06:00