saltstack/salt — pull request #5628 by felskrone (2013-06-19 13:53:23+00:00)
Title: Fix batch timeout and infinite while-loop in batch-mode

A 1 second timeout to detect minions for a batch run is fairly optimistic for larger networks that span over large distances. Here it repeatedly resulted in not all minions being detected and the batch-run to be only run on about 75-90% of the minions. Im not sure that 5 seconds is fine for you, but it works here and seems alright for me on larger networks. Maybe make it configurable in the future?

The second change is a fix for the while loop on line 84 which would essentially never brake due to 'ret' not being updated in line 130/131.