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
..
__init__.py	Include the python encoding file header on tests.	2013-11-27 11:19:24 +00:00
boto_sns.py	Py3 compatibility	2015-01-30 22:27:10 +00:00
bower.py	Implement Bower state module	2015-02-21 05:57:54 +00:00
cmd.py	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-04-16 12:15:44 -06:00
compiler.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
file.py	Py3 compatibility	2015-01-30 22:27:05 +00:00
git.py	Change Github to GitHub	2015-02-15 15:19:54 +01:00
handle_error.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
handle_iorder.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
host.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
match.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
mysql.py	Py3 compatibility fixes	2015-01-30 22:25:04 +00:00
npm.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
pip.py	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-04-16 12:15:44 -06:00
pkg.py	Py3 compatibility fixes	2015-01-30 22:25:04 +00:00
pkgrepo.py	Py3 compatibility fixes	2015-01-30 22:25:05 +00:00
rabbitmq_user.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
rabbitmq_vhost.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
renderers.py	Add tests for the jinja demands	2015-04-15 16:39:08 -06:00
ssh.py	Merge branch '2015.2' into 2015.2-develop	2015-03-10 17:47:30 -05:00
supervisord.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
svn.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
user.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
virtualenv.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00