Merge pull request #1755 from bcwaldon/golang.org-deps

Switch to golang.org/x/net/context
2014-11-20 16:26:14 -08:00
parent 5139257b8d da5538b8c7
commit c0fb1c8a00
27 changed files with 43 additions and 42 deletions
--- a/rafthttp/http.go
+++ b/rafthttp/http.go
@ -27,7 +27,7 @@ import (
 	"github.com/coreos/etcd/pkg/types"
 	"github.com/coreos/etcd/raft/raftpb"

-	"github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/go.net/context"
+	"github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context"
 )

 var (