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

Merge branch '2016.3' into '2016.11'

Browse source 
No conflicts.
This commit is contained in:
rallytime 2017-03-13 09:19:34 -06:00
commit ef6f4b15ca
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/modules/dockerng.py
View file

@ -813,7 +813,8 @@ def _get_client(timeout=None):
- docker.url: URL to the docker service
- docker.version: API version to use (default: "auto")
'''
if 'docker.client' not in __context__:
if 'docker.client' not in __context__ \
or not hasattr(__context__['docker.client'], 'timeout'):
client_kwargs = {}
for key, val in (('base_url', 'docker.url'),
('version', 'docker.version')):