Merge pull request #819 from jbenet/x_net_context_leeroy

update context imports to golang.org/x/net
ipfs · Feb 25, 2015 · 88dea57 · 88dea57
2 parents f51e464 + 92d08db
commit 88dea57
Show file tree

Hide file tree

Showing 165 changed files with 258 additions and 271 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup/Godeps/Godeps.json b/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup/ctxgroup.go b/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup/ctxgroup.go
diff --git a/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup/ctxgroup_test.go b/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup/ctxgroup_test.go
diff --git a/Godeps/_workspace/src/github.com/jbenet/goprocess/context/context.go b/Godeps/_workspace/src/github.com/jbenet/goprocess/context/context.go
diff --git a/...de.google.com/p/go.net/context/context.go → ...e/src/golang.org/x/net/context/context.go b/...de.google.com/p/go.net/context/context.go → ...e/src/golang.org/x/net/context/context.go
diff --git a/...ogle.com/p/go.net/context/context_test.go → .../golang.org/x/net/context/context_test.go b/...ogle.com/p/go.net/context/context_test.go → .../golang.org/x/net/context/context_test.go
diff --git a/....com/p/go.net/context/withtimeout_test.go → ...ang.org/x/net/context/withtimeout_test.go b/....com/p/go.net/context/withtimeout_test.go → ...ang.org/x/net/context/withtimeout_test.go
diff --git a/blocks/blockstore/blockstore.go b/blocks/blockstore/blockstore.go
@@ -5,12 +5,11 @@ package blockstore
 import (
 	"errors"
 
-	context "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"
 	dsns "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/namespace"
 	dsq "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/query"
 	mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
-
+	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 	blocks "github.com/jbenet/go-ipfs/blocks"
 	eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
 	u "github.com/jbenet/go-ipfs/util"

diff --git a/blocks/blockstore/blockstore_test.go b/blocks/blockstore/blockstore_test.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"testing"
 
-	context "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"
 	dsq "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/query"
 	ds_sync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
+	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 
 	blocks "github.com/jbenet/go-ipfs/blocks"
 	u "github.com/jbenet/go-ipfs/util"