Colton Myers 40718af1d5 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 ... Conflicts: doc/conf.py salt/modules/win_service.py tests/integration/cloud/providers/digital_ocean.py		2015-08-26 14:29:57 -06:00
..
cli	Fix test to give more data on failure	2015-03-27 16:50:39 -06:00
client	disable intermittently failing tests	2015-05-28 16:23:57 -06:00
cloud	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5	2015-08-26 14:29:57 -06:00
files	Also add -Z to script args for cloud tests	2015-08-24 16:02:26 -06:00
fileserver	Pylint fix - remove unused import	2015-02-11 09:35:04 -07:00
loader	Fix many errors with __virtual__ in tests	2015-08-21 14:01:03 -06:00
mockbin	Add "mockbin" directory and a fake "su" wrapper for tests	2012-07-26 22:14:00 +06:00
modules	Merge pull request #24768 from jfindlay/pkg_mod	2015-06-18 09:13:12 -06:00
netapi	Add runner_async endpoint to salnado	2015-07-15 09:07:26 -07:00
output	Fix imports	2015-02-26 09:41:22 +00:00
runners	disable intermittently failing tests	2015-05-28 16:23:57 -06:00
shell	disable intermittently failing tests	2015-05-28 16:23:57 -06:00
ssh	More Pylint	2014-05-23 15:27:19 -06:00
states	Integration Test for Issue 25250	2015-07-24 13:28:15 -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	Pass opts not an ImmutableDict of opts	2015-01-28 18:43:45 -08:00
__init__.py	Some small test clean up changes	2015-04-24 16:27:22 -06:00