From a91825094db96b824029d285e748f488fc381ac3 Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Wed, 27 Jan 2016 14:28:34 -0800
Subject: [PATCH] initial vendoring of libp2p outside of the repo with gx
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
---
gc/gc.go | 4 ++--
pin.go | 4 ++--
pin_test.go | 2 +-
set.go | 2 +-
set_test.go | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/gc/gc.go b/gc/gc.go
index df9dded..daa082f 100644
--- a/gc/gc.go
+++ b/gc/gc.go
@@ -8,8 +8,8 @@ import (
dag "github.com/ipfs/go-ipfs/merkledag"
pin "github.com/ipfs/go-ipfs/pin"
- context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
- logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
+ logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
)
var log = logging.Logger("gc")
diff --git a/pin.go b/pin.go
index 86b0d58..cd17dab 100644
--- a/pin.go
+++ b/pin.go
@@ -8,11 +8,11 @@ import (
"time"
ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
- context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
key "github.com/ipfs/go-ipfs/blocks/key"
"github.com/ipfs/go-ipfs/blocks/set"
mdag "github.com/ipfs/go-ipfs/merkledag"
- logging "github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log"
+ logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
)
var log = logging.Logger("pin")
diff --git a/pin_test.go b/pin_test.go
index 9356d31..5dd9c45 100644
--- a/pin_test.go
+++ b/pin_test.go
@@ -4,7 +4,7 @@ import (
"testing"
"time"
- context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
dssync "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore/sync"
diff --git a/set.go b/set.go
index 71851af..9188f4d 100644
--- a/set.go
+++ b/set.go
@@ -12,7 +12,7 @@ import (
"unsafe"
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto"
- "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+ "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
"github.com/ipfs/go-ipfs/blocks/key"
"github.com/ipfs/go-ipfs/merkledag"
"github.com/ipfs/go-ipfs/pin/internal/pb"
diff --git a/set_test.go b/set_test.go
index b076c41..eb796d9 100644
--- a/set_test.go
+++ b/set_test.go
@@ -6,7 +6,7 @@ import (
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
dssync "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore/sync"
- "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+ "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
"github.com/ipfs/go-ipfs/blocks/blockstore"
"github.com/ipfs/go-ipfs/blocks/key"
"github.com/ipfs/go-ipfs/blockservice"
--
GitLab