saltstack/salt — pull request #12140 by steverweber (2014-04-19 00:03:15+00:00)
Title: fix get fqdn

you cant simple check if ```socket.gethostname()``` returns a string with a dot.

A hostname can have a dot in its name and still not be FQDN!
This patch will return the socket.fqhostname() if it's longer then the socket.hostname().

Note: this patch was not tested... so please give it a test before pull :)