saltstack/salt — pull request #2507 by UtahDave (2012-11-10 04:24:42+00:00)
Title: Fixes #2064 Add option for minion to retry dns resolution

Previously if the minion couldn't resolve the master's hostname, the minion would fail and try to log into a master on the localhost.

New option in the minion config:
retry_dns: 30

Set to zero to fail instead of trying again to resolve the master hostname.