Thomas S Hatch bf397d12b3 Merge pull request #20094 from basepi/merge-forward-develop ... Merge forward from 2015.2 to develop		2015-01-27 10:04:51 -07:00
..
cli	Adjust batch test	2015-01-05 10:04:15 -07:00
client	Switch open() for salt.utils.fopen()	2014-11-26 17:39:49 +00:00
cloud	Remove 'running' check - it's not reliable	2014-09-23 15:06:08 -06:00
files	Keep package name the same	2015-01-08 12:13:26 -07:00
fileserver	Allow getting the configuration from scratch.	2014-10-08 01:00:06 +01:00
loader	Fix linode test failures and test all modules	2014-09-25 11:34:50 -06:00
mockbin	Add "mockbin" directory and a fake "su" wrapper for tests	2012-07-26 22:14:00 +06:00
modules	Pylint fixes for the 2015.2 branch	2015-01-23 10:57:18 -07:00
netapi	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-01-26 19:44:59 -07:00
output	pep8	2014-10-13 15:32:11 -06:00
runners	Fix up tests	2014-11-10 15:42:45 -07:00
shell	Merge branch '2014.7' into 2015.2	2015-01-11 22:40:16 +00:00
ssh	More Pylint	2014-05-23 15:27:19 -06:00
states	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-01-26 19:44:59 -07:00
utils	cleanup "Caste jid as str (its an int all over), and change runner tag to correct prefix"	2015-01-10 16:32:24 -08:00
wheel	Merge branch '2014.7' into develop	2014-10-13 20:06:17 -06:00
__init__.py	Increae default runner timeout to 60s	2015-01-26 10:59:55 -07:00