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
..
cli	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-04-01 14:22:33 -06:00
client	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2	2015-05-29 15:10:13 -06:00
cloud	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-09-14 14:39:03 -06:00
files	Fix tests: add module function docstring	2015-10-26 16:07:52 +03:00
fileserver	More test fixes	2015-07-22 10:40:49 -05:00
loader	commit 7b262f8 missed one fix	2015-10-28 17:18:01 -07:00
mockbin	Add "mockbin" directory and a fake "su" wrapper for tests	2012-07-26 22:14:00 +06:00
modules	Merge pull request #28505 from plastikos/improvement-minio_process_grains	2015-11-04 07:40:05 -07:00
netapi	Remove mocks from rest_cherrypy integration tests	2015-09-09 10:39:35 -06:00
output	Lint	2015-08-27 13:46:29 -06:00
runners	Lint fixes	2015-08-21 13:48:55 -05:00
shell	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-11-13 15:18:45 -07:00
ssh	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
states	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-10-13 17:27:48 -06:00
utils	cleanup "Caste jid as str (its an int all over), and change runner tag to correct prefix"	2015-01-28 18:43:43 -08:00
wheel	Cast to dict to fix wheel tests in tcp	2015-11-12 12:21:52 -07:00
__init__.py	Merge pull request #28215 from s0undt3ch/features/signal-handling	2015-11-09 12:11:15 -07:00