Commit Graph

3 Commits

Author SHA1 Message Date
Thomas Jackson
645027c0fe 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-28 18:43:43 -08:00
Thomas Jackson
5bfef71240 Pylint fix 2015-01-28 18:43:43 -08:00
Thomas Jackson
d8e8de2a19 Caste jid as str (its an int all over), and change runner tag to correct prefix
Conflicts:

	salt/utils/event.py
2015-01-28 18:43:40 -08:00