toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #19984 from calavera/vendor_engine_api_master

Browse Source 
Vendor engine-api with client context changes.
Upstream-commit: da58ee42bb1d4e17c5b525d161f29ad8efc0569e
Component: engine
This commit is contained in:
Tibor Vass
2016-02-04 16:20:06 -05:00
parent 1386bb7cb2 32fac24f32
commit 9a586d64c2
54 changed files with 714 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/integration-cli/docker_utils.go
View File

@ -194,7 +194,7 @@ func (d *Daemon) getClientConfig() (*clientConfig, error) {
transport = &http.Transport{}
}
sockets.ConfigureTCPTransport(transport, proto, addr)
sockets.ConfigureTransport(transport, proto, addr)
return &clientConfig{
transport: transport,