Thomas S Hatch 36bf8122e9 Merge branch 'timeout-for-run-command' of git://github.com/hulu/salt into hulu-timeout-for-run-command ... Conflicts: salt/states/cmd.py		2013-06-11 16:30:41 -06:00
..
client	Add success flag to LocalClient.get_full_return()	2013-06-06 10:09:15 +10:00
files	Add overstate to check parse failures in requisites	2013-06-10 23:00:22 -06:00
mockbin	Add "mockbin" directory and a fake "su" wrapper for tests	2012-07-26 22:14:00 +06:00
modules	Add timeout to salt.state.cmd.* functions	2013-06-11 11:41:42 -07:00
runners	Add parse req failure state	2013-06-10 23:00:48 -06:00
shell	Fix a misplaced continue on the grains matching logic which caused a traceback.	2013-03-13 01:02:15 +00:00
states	Improve file.directory for clean=True	2013-06-11 02:28:51 +02:00
__init__.py	rm unnecessary parens around 'del'; it's not a function	2013-06-03 11:53:04 -07:00