From bcde4812dbb6b051c673b5bf4717cabf8d85bb71 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 13 Jul 2018 09:53:36 +0200 Subject: [PATCH] Remove stray uses of "golang.org/x/net/context" Signed-off-by: Sebastiaan van Stijn Upstream-commit: 4c0a050ee24beb399b11c48829522e48f8d0b98a Component: engine --- components/engine/client/build_cancel.go | 3 +-- components/engine/client/hijack_test.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/components/engine/client/build_cancel.go b/components/engine/client/build_cancel.go index 4cf8c980a9..74df495089 100644 --- a/components/engine/client/build_cancel.go +++ b/components/engine/client/build_cancel.go @@ -1,9 +1,8 @@ package client // import "github.com/docker/docker/client" import ( + "context" "net/url" - - "golang.org/x/net/context" ) // BuildCancel requests the daemon to cancel ongoing build request diff --git a/components/engine/client/hijack_test.go b/components/engine/client/hijack_test.go index 823bf344f5..d71dc9ea38 100644 --- a/components/engine/client/hijack_test.go +++ b/components/engine/client/hijack_test.go @@ -1,6 +1,7 @@ package client import ( + "context" "fmt" "io/ioutil" "net" @@ -12,7 +13,6 @@ import ( "github.com/docker/docker/api/server/httputils" "github.com/docker/docker/api/types" "github.com/pkg/errors" - "golang.org/x/net/context" "gotest.tools/assert" )