Colton Myers efb479a1bd Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: doc/topics/cloud/vmware.rst salt/cloud/clouds/vmware.py salt/grains/chronos.py salt/grains/marathon.py salt/loader.py salt/modules/chronos.py salt/modules/marathon.py salt/proxy/chronos.py salt/proxy/marathon.py salt/state.py salt/states/chronos_job.py salt/states/marathon_app.py salt/states/user.py salt/utils/schedule.py		2015-11-13 15:18:45 -07:00
..
__init__.py	Include the python encoding file header on tests.	2013-11-27 11:19:24 +00:00
arguments.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
auth.py	Lint (blank lines)	2015-03-21 15:36:04 -06:00
call.py	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-11-13 15:18:45 -07:00
cloud.py	The imports do work!	2015-01-30 22:25:29 +00:00
cp.py	Try to overcome a failure to get cwd in Cent tests	2015-07-28 12:07:04 +01:00
enabled.py	Python 3 compat fixes for develop	2015-04-17 12:00:01 -06:00
key.py	Try to overcome a failure to get cwd in Cent tests	2015-07-28 12:07:04 +01:00
master_tops.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
master.py	Try to overcome a failure to get cwd in Cent tests	2015-07-28 12:07:04 +01:00
matcher.py	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-11-13 15:18:45 -07:00
minion.py	Try to overcome a failure to get cwd in Cent tests	2015-07-28 12:07:04 +01:00
runner.py	Try to overcome a failure to get cwd in Cent tests	2015-07-28 12:07:04 +01:00
syndic.py	Try to overcome a failure to get cwd in Cent tests	2015-07-28 12:07:04 +01:00