summaryrefslogtreecommitdiff
path: root/client/network_connect_test.go
diff options
context:
space:
mode:
authorKir Kolyshkin <kolyshkin@gmail.com>2018-04-19 15:30:59 -0700
committerKir Kolyshkin <kolyshkin@gmail.com>2018-04-23 13:52:44 -0700
commit7d62e40f7e4f3c17d229a7687d6fcca5448de813 (patch)
treedbba5821b6d9b9f9bdd414248bfbfcff932b77cb /client/network_connect_test.go
parent5c233cf4315747785b27d4b0f0631d220556205f (diff)
downloaddocker-7d62e40f7e4f3c17d229a7687d6fcca5448de813.tar.gz
Switch from x/net/context -> context
Since Go 1.7, context is a standard package. Since Go 1.9, everything that is provided by "x/net/context" is a couple of type aliases to types in "context". Many vendored packages still use x/net/context, so vendor entry remains for now. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Diffstat (limited to 'client/network_connect_test.go')
-rw-r--r--client/network_connect_test.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/client/network_connect_test.go b/client/network_connect_test.go
index 28b1c0069c..07a3ba692e 100644
--- a/client/network_connect_test.go
+++ b/client/network_connect_test.go
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
import (
"bytes"
+ "context"
"encoding/json"
"fmt"
"io/ioutil"
@@ -9,8 +10,6 @@ import (
"strings"
"testing"
- "golang.org/x/net/context"
-
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/network"
)