Revert "use builtin package context rather than vendored one"

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
ggrighi15 · Jul 28, 2017 · e5bba51 · e5bba51
1 parent 7a064d0
commit e5bba51
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/libnetwork/cluster/provider.go b/libnetwork/cluster/provider.go
@@ -1,9 +1,8 @@
 package cluster
 
 import (
-	"context"
-
 	"github.com/docker/docker/api/types/network"
+	"golang.org/x/net/context"
 )
 
 const (

diff --git a/libnetwork/cmd/dnet/dnet.go b/libnetwork/cmd/dnet/dnet.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -37,6 +36,7 @@ import (
 	"github.com/docker/libnetwork/options"
 	"github.com/docker/libnetwork/types"
 	"github.com/gorilla/mux"
+	"golang.org/x/net/context"
 )
 
 const (