obey Hostname Username Port and ProxyCommand settings from .ssh/config

Signed-off-by: Till Riedel <[email protected]>

Author: riedel

docker/transport/sshconn.py

@@ -2,10 +2,7 @@
 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