Procházet zdrojové kódy

Revert "use builtin package context rather than vendored one"

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
Flavio Crisciani před 8 roky
rodič
revize
e5bba51d4f
2 změnil soubory, kde provedl 2 přidání a 3 odebrání
  1. 1 2
      libnetwork/cluster/provider.go
  2. 1 1
      libnetwork/cmd/dnet/dnet.go

+ 1 - 2
libnetwork/cluster/provider.go

@@ -1,9 +1,8 @@
 package cluster
 package cluster
 
 
 import (
 import (
-	"context"
-
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/api/types/network"
+	"golang.org/x/net/context"
 )
 )
 
 
 const (
 const (

+ 1 - 1
libnetwork/cmd/dnet/dnet.go

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