diff options
author | Flavio Crisciani <flavio.crisciani@docker.com> | 2017-07-28 11:14:46 -0700 |
---|---|---|
committer | Flavio Crisciani <flavio.crisciani@docker.com> | 2017-07-28 11:23:40 -0700 |
commit | e5bba51d4f4fd9eb09ab9789a2e6d38df0fce89d (patch) | |
tree | 19c99a838a86f1e6833c697132ae10b2301796c4 /libnetwork/cmd | |
parent | 7a064d0ec0c043a3963f06efaf4686837d9a780f (diff) | |
download | docker-e5bba51d4f4fd9eb09ab9789a2e6d38df0fce89d.tar.gz |
Revert "use builtin package context rather than vendored one"
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
Diffstat (limited to 'libnetwork/cmd')
-rw-r--r-- | libnetwork/cmd/dnet/dnet.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libnetwork/cmd/dnet/dnet.go b/libnetwork/cmd/dnet/dnet.go index ada5f6481f..0762de3349 100644 --- a/libnetwork/cmd/dnet/dnet.go +++ b/libnetwork/cmd/dnet/dnet.go @@ -2,7 +2,6 @@ package main import ( "bytes" - "context" "encoding/json" "errors" "fmt" @@ -37,6 +36,7 @@ import ( "github.com/docker/libnetwork/options" "github.com/docker/libnetwork/types" "github.com/gorilla/mux" + "golang.org/x/net/context" ) const ( |