Merge branch 'master' into 4091-test-infinite-scrolling

[arvados.git] / services / nodemanager / arvnodeman / config.py

diff --git a/services/nodemanager/arvnodeman/config.py b/services/nodemanager/arvnodeman/config.py
index 07504e2fe9aa9e0007044881c57c1ad6793426d0..1699584b200e99ab249ae6f15d63e6888325890e 100644 (file)
--- a/services/nodemanager/arvnodeman/config.py
+++ b/services/nodemanager/arvnodeman/config.py
@@ -7,11 +7,11 @@ import importlib
 import logging
 import ssl
 
-import apiclient.errors as apierror
 import arvados
 import httplib2
 import libcloud.common.types as cloud_types
 import pykka
+from apiclient import errors as apierror
 
 # IOError is the base class for socket.error and friends.
 # It seems like it hits the sweet spot for operations we want to retry: