Merge pull request #2500 from stevvooe/remove-net-context-vestiges

context, registry/handlers: remove net/context references

context/doc.go

@@ -1,7 +1,6 @@
 // Package context provides several utilities for working with
-// golang.org/x/net/context in http requests. Primarily, the focus is on
-// logging relevant request information but this package is not limited to
-// that purpose.
+// Go's context in http requests. Primarily, the focus is on logging relevant
+// request information but this package is not limited to that purpose.
 //
 // The easiest way to get started is to get the background context:
 //

registry/handlers/context.go

@@ -1,6 +1,7 @@
 package handlers
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 
@@ -10,7 +11,6 @@ import (
 	"github.com/docker/distribution/registry/api/v2"
 	"github.com/docker/distribution/registry/auth"
 	"github.com/opencontainers/go-digest"
-	"golang.org/x/net/context"
 )
 
 // Context should contain the request specific context for use in across