Merge pull request #2305 from kolyshkin/context

Switch from x/net/context -> context
2018-04-25 10:44:22 -07:00
parent e073a48c7b bbe14f0a2e
commit 1a5e0df98f
42 changed files with 309 additions and 206 deletions
--- a/cmd/ctr/commands/shim/shim.go
+++ b/cmd/ctr/commands/shim/shim.go
@@ -19,12 +19,11 @@
 package shim

 import (
+	gocontext "context"
 	"fmt"
 	"io/ioutil"
 	"net"

-	gocontext "context"
-
 	"github.com/containerd/console"
 	"github.com/containerd/containerd/cmd/ctr/commands"
 	shim "github.com/containerd/containerd/linux/shim/v1"