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

Docker changes for libnetwork vendoring..

Browse Source 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 64a6dc355815261ac438b12a262e3cda7c9181df
Component: engine
This commit is contained in:
Santhosh Manohar
2016-01-08 13:38:52 -08:00
parent d53ca527b3
commit d8dc8b7d33
7 changed files with 22 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/api/server/router/network/network_routes.go
View File

@ -182,7 +182,7 @@ func buildNetworkResource(nw libnetwork.Network) *types.NetworkResource {
}
func buildIpamResources(r *types.NetworkResource, nw libnetwork.Network) {
id, ipv4conf, ipv6conf := nw.Info().IpamConfig()
id, _, ipv4conf, ipv6conf := nw.Info().IpamConfig()
r.IPAM.Driver = id