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

Change comment and salt.utils.network import

Browse source
This commit is contained in:
Ch3LL 2018-03-14 10:56:52 -04:00
parent e972ebdf1a
commit da38f332a5
No known key found for this signature in database
GPG key ID: 132B55A7C13EFA73
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/minion.py
View file

@ -144,8 +144,8 @@ def resolve_dns(opts, fallback=True):
if (opts.get('file_client', 'remote') == 'local' and
not opts.get('use_master_when_local', False)):
check_dns = False
# Because I import salt.log below I need to re-import salt.utils here
import salt.utils
# Since salt.log is imported below, salt.utils.network needs to be imported here as well
import salt.utils.network
if check_dns is True:
try: