瀏覽代碼

Remove stray uses of "golang.org/x/net/context"

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 7 年之前
父節點
當前提交
4c0a050ee2
共有 2 個文件被更改,包括 2 次插入3 次删除
  1. 1 2
      client/build_cancel.go
  2. 1 1
      client/hijack_test.go

+ 1 - 2
client/build_cancel.go

@@ -1,9 +1,8 @@
 package client // import "github.com/docker/docker/client"
 package client // import "github.com/docker/docker/client"
 
 
 import (
 import (
+	"context"
 	"net/url"
 	"net/url"
-
-	"golang.org/x/net/context"
 )
 )
 
 
 // BuildCancel requests the daemon to cancel ongoing build request
 // BuildCancel requests the daemon to cancel ongoing build request

+ 1 - 1
client/hijack_test.go

@@ -1,6 +1,7 @@
 package client
 package client
 
 
 import (
 import (
+	"context"
 	"fmt"
 	"fmt"
 	"io/ioutil"
 	"io/ioutil"
 	"net"
 	"net"
@@ -12,7 +13,6 @@ import (
 	"github.com/docker/docker/api/server/httputils"
 	"github.com/docker/docker/api/server/httputils"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types"
 	"github.com/pkg/errors"
 	"github.com/pkg/errors"
-	"golang.org/x/net/context"
 	"gotest.tools/assert"
 	"gotest.tools/assert"
 )
 )