saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fixup rebase merge goof

Browse source
This commit is contained in:
Jeremy McMillan 2019-01-05 15:53:36 -06:00 • committed by Pedro Algarvio
parent d28bab6fd0
commit e169e0df54
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/utils/network.py
View file

@ -236,13 +236,8 @@ def get_fqhostname():
"""
Returns the fully qualified hostname
"""
<<<<<<< HEAD
fqdn = []
fqdn.append(socket.getfqdn())
=======
l = []
l.append(socket.getfqdn())
>>>>>>> fix parse_host_port() parse error on hostname only arg
# try socket.getaddrinfo
try: