saltstack/salt — pull request #11704 by rallytime (2014-04-01 19:50:44+00:00)
Title: Added try/except to use old socket.get_gqdn if socket.getaddrinfo fails

References #11660

Added a ```try:except:``` to ```network.get_fqhostname``` to handle the thrown exception in gethostbyname when ```sockets.getaddrinfo``` fails.

Some basic tests are forthcoming.