saltstack/salt — pull request #11674 by terminalmage (2014-03-31 21:25:31+00:00)
Title: Fix traceback in salt.utils.network.get_fqhostname

This traceback occurs when the lookup fails in some way, raising an
exception.

This code is only in develop and does not need to be cherrypicked.