Merge pull request #2154 from dmcgowan/shared-content-ingests

content: shared content across namespaces
2018-03-12 16:11:32 -07:00
parent 3013762fc5 a1a67899f8
commit b3b95c0a2a
11 changed files with 577 additions and 88 deletions
--- a/namespaces/context.go
+++ b/namespaces/context.go
@@ -17,11 +17,11 @@
 package namespaces

 import (
+	"context"
 	"os"

 	"github.com/containerd/containerd/errdefs"
 	"github.com/pkg/errors"
-	"golang.org/x/net/context"
 )

 const (