diff options
author | Kir Kolyshkin <kolyshkin@gmail.com> | 2018-04-19 15:30:59 -0700 |
---|---|---|
committer | Kir Kolyshkin <kolyshkin@gmail.com> | 2018-04-23 13:52:44 -0700 |
commit | 7d62e40f7e4f3c17d229a7687d6fcca5448de813 (patch) | |
tree | dbba5821b6d9b9f9bdd414248bfbfcff932b77cb /integration-cli/docker_api_build_test.go | |
parent | 5c233cf4315747785b27d4b0f0631d220556205f (diff) | |
download | docker-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 'integration-cli/docker_api_build_test.go')
-rw-r--r-- | integration-cli/docker_api_build_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/integration-cli/docker_api_build_test.go b/integration-cli/docker_api_build_test.go index e997274a05..e2c4780274 100644 --- a/integration-cli/docker_api_build_test.go +++ b/integration-cli/docker_api_build_test.go @@ -3,6 +3,7 @@ package main import ( "archive/tar" "bytes" + "context" "encoding/json" "fmt" "io" @@ -20,7 +21,6 @@ import ( "github.com/go-check/check" "github.com/gotestyourself/gotestyourself/assert" is "github.com/gotestyourself/gotestyourself/assert/cmp" - "golang.org/x/net/context" ) func (s *DockerSuite) TestBuildAPIDockerFileRemote(c *check.C) { |