Merge pull request #39988 from terminalmage/dockerng-timeout

Add comment explaining change from #39973
saltstack · Mar 13, 2017 · e125c94 · e125c94
2 parents cd0336e + bd2519e
commit e125c94
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/salt/modules/dockerng.py b/salt/modules/dockerng.py
@@ -775,6 +775,8 @@ def _get_client(timeout=None):
         - docker.url: URL to the docker service
         - docker.version: API version to use (default: "auto")
     '''
+    # In some edge cases, the client instance is missing attributes. Don't use
+    # the cached client in those cases.
     if 'docker.client' not in __context__ \
             or not hasattr(__context__['docker.client'], 'timeout'):
         client_kwargs = {}