Merge pull request #819 from jbenet/x_net_context_leeroy

update context imports to golang.org/x/net

Merge pull request #819 from jbenet/x_net_context_leeroy
update context imports to golang.org/x/net
c0fdcddd · Juan Batiz-Benet · 6b082dc0 · 7659d388 · c0fdcddd · c0fdcddd
Commit c0fdcddd authored Feb 25, 2015 by Juan Batiz-Benet
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

merkledag.go merkledag.go +1 -2

merkledag_test.go merkledag_test.go +1 -1

No files found.
--- a/merkledag.go
+++ b/merkledag.go
@@ -6,8 +6,7 @@ import (
 	"sync"
 	"time"

-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
-
+	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 	blocks "github.com/jbenet/go-ipfs/blocks"
 	bserv "github.com/jbenet/go-ipfs/blockservice"
 	u "github.com/jbenet/go-ipfs/util"

--- a/merkledag_test.go
+++ b/merkledag_test.go
@@ -8,9 +8,9 @@ import (
 	"sync"
 	"testing"

-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
 	dssync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
+	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 	bstore "github.com/jbenet/go-ipfs/blocks/blockstore"
 	blockservice "github.com/jbenet/go-ipfs/blockservice"
 	bserv "github.com/jbenet/go-ipfs/blockservice"