saltstack/salt — pull request #15942 by jacksontj (2014-09-18 20:57:50+00:00)
Title: Change timeout for CLI returns

This is a fix for #15905, the intent being that if you set a timeout it will actually time out. If you pass/set a timeout of 0 it will do the checking of minions etc to determine if the job is running. This seems to be a better compromise since the user/admin can decide wether to have timeouts or not