diff options
| author | Till Riedel <riedel@teco.edu> | 2019-04-14 13:52:12 +0200 |
|---|---|---|
| committer | aiordache <anca.iordache@docker.com> | 2020-08-10 19:14:00 +0200 |
| commit | fcd0093050714de06bcaf05781a995f044f20ce2 (patch) | |
| tree | e69f9677da94b77e5d44b385de31e4d04f3ff42a | |
| parent | 70cdb08f9ad2e462423b0c4b42af3e6307cd392a (diff) | |
| download | docker-py-fcd0093050714de06bcaf05781a995f044f20ce2.tar.gz | |
obey Hostname Username Port and ProxyCommand settings from .ssh/config
Signed-off-by: Till Riedel <riedel@teco.edu>
| -rw-r--r-- | docker/transport/sshconn.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/docker/transport/sshconn.py b/docker/transport/sshconn.py index 57b55c9..7de0e59 100644 --- a/docker/transport/sshconn.py +++ b/docker/transport/sshconn.py @@ -2,10 +2,7 @@ import paramiko import requests.adapters import six import logging -<<<<<<< HEAD import os -======= ->>>>>>> 2dc569a... set logging level of paramiko to warn from docker.transport.basehttpadapter import BaseHTTPAdapter from .. import constants |