Thomas Jackson e35c7ac313 cleanup "Caste jid as str (its an int all over), and change runner tag to correct prefix" ... This reverts most of commit 745f2d84835ae23800358cd4dcc9c8525b502714. apparently I picked up some other changes I didn't mean to Conflicts: salt/utils/event.py tests/integration/utils/test_reactor.py		2015-01-10 16:32:24 -08: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	Merge branch '2015.2' into develop	2015-01-08 11:29:08 -07:00
netapi	Temporarily change this test to work around race condition in the runnerclient	2015-01-10 00:18:16 -08:00
output	pep8	2014-10-13 15:32:11 -06:00
runners	Fix up tests	2014-11-10 15:42:45 -07:00
shell	Async flag and test cleanup	2015-01-09 13:14:33 -07:00
ssh	More Pylint	2014-05-23 15:27:19 -06:00
states	Cleaner and actual fix for the failing weird pip test for CentOS 5	2015-01-09 10:52:55 -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	Typo	2015-01-09 13:26:25 -07:00