saltstack/salt — pull request #10348 by bbinet (2014-02-11 17:31:33+00:00)
Title: minion connection timeout is too small

When network is slow (e.g. 3g connection), minions in multi-master mode fail
to connect: the timeout of 1sec expires before the connection can be
established.

This pull request fixes the issue that I reported on the mailing list:
https://groups.google.com/d/topic/salt-users/sOxJu0n14qU/discussion

This patch is trivial and sets the timeout to 5s instead of 1s. Do we need to make this timeout configurable?