Merge pull request #133 from kolyshkin/context

Switch from x/net/context to context
containerd · Sep 18, 2018 · f04dbc0 · f04dbc0
2 parents c2ac4ec + 508ef95
commit f04dbc0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,10 +2,9 @@ language: go
 sudo: required
 
 go:
-  - 1.8.x
   - 1.9.x
   - 1.10.x
-  - 1.x
+  - 1.11.x
   - tip
 
 go_import_path: github.com/containerd/continuity

diff --git a/continuityfs/fuse.go b/continuityfs/fuse.go
@@ -19,6 +19,7 @@
 package continuityfs
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"io"
@@ -31,7 +32,6 @@ import (
 	"github.com/containerd/continuity"
 	"github.com/opencontainers/go-digest"
 	"github.com/sirupsen/logrus"
-	"golang.org/x/net/context"
 )
 
 // File represents any file type (non directory) in the filesystem