From 680832b7b017a32308d36012a4728ea286c4d012 Mon Sep 17 00:00:00 2001 From: allencloud Date: Thu, 13 Jul 2017 14:03:42 +0800 Subject: [PATCH] use builtin package context rather than vendored one Signed-off-by: allencloud --- libnetwork/cluster/provider.go | 3 ++- libnetwork/cmd/dnet/dnet.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libnetwork/cluster/provider.go b/libnetwork/cluster/provider.go index 491ccfd4b8..0259eb7005 100644 --- a/libnetwork/cluster/provider.go +++ b/libnetwork/cluster/provider.go @@ -1,8 +1,9 @@ package cluster import ( + "context" + "github.com/docker/docker/api/types/network" - "golang.org/x/net/context" ) const ( diff --git a/libnetwork/cmd/dnet/dnet.go b/libnetwork/cmd/dnet/dnet.go index 0762de3349..ada5f6481f 100644 --- a/libnetwork/cmd/dnet/dnet.go +++ b/libnetwork/cmd/dnet/dnet.go @@ -2,6 +2,7 @@ package main import ( "bytes" + "context" "encoding/json" "errors" "fmt" @@ -36,7 +37,6 @@ import ( "github.com/docker/libnetwork/options" "github.com/docker/libnetwork/types" "github.com/gorilla/mux" - "golang.org/x/net/context" ) const (