diff options
| author | Kir Kolyshkin <kolyshkin@gmail.com> | 2018-04-24 14:44:55 -0700 |
|---|---|---|
| committer | Kir Kolyshkin <kolyshkin@gmail.com> | 2018-04-24 14:57:04 -0700 |
| commit | 0f6cb61f2ded5e66c7481aa464fc432954a417b4 (patch) | |
| tree | 72dfabf745e6479a041b2e3e290eda45ccbffefe /libnetwork/cmd | |
| parent | a6ec9e673b2d2917641e67b5d029cd246bd9ea74 (diff) | |
| download | docker-0f6cb61f2ded5e66c7481aa464fc432954a417b4.tar.gz | |
Switch from x/net/context -> context
Since Go 1.7, context is a standard package. Since about Go 1.9 time,
all x/net/context provides is a few aliases to types in context, meaning
"x/net/context" and "context" can be mixed freely.
Some vendored packages still use x/net/context, so vendor entry remains
for now.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.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 ff5c9df5f3..cccc2c72c8 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/types" "github.com/gorilla/mux" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) const ( |