diff --git a/Godeps/_workspace/src/github.com/ipfs/go-datastore/flatfs/flatfs.go b/Godeps/_workspace/src/github.com/ipfs/go-datastore/flatfs/flatfs.go
index c0165dd0eefe221779150d0580bf684397b57950..9eafb88cef28dff107563acd9ed9a9836256806e 100644
--- a/Godeps/_workspace/src/github.com/ipfs/go-datastore/flatfs/flatfs.go
+++ b/Godeps/_workspace/src/github.com/ipfs/go-datastore/flatfs/flatfs.go
@@ -17,7 +17,7 @@ import (
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore/query"
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-os-rename"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("flatfs")
diff --git a/blocks/blockstore/blockstore.go b/blocks/blockstore/blockstore.go
index f7bbbc8aac852eeee67d8c2cbc56606d7a8246db..8221ec4a5de4122138158aac4efcbfee4d700b95 100644
--- a/blocks/blockstore/blockstore.go
+++ b/blocks/blockstore/blockstore.go
@@ -11,10 +11,10 @@ import (
dsns "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore/namespace"
dsq "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore/query"
mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
blocks "github.com/ipfs/go-ipfs/blocks"
key "github.com/ipfs/go-ipfs/blocks/key"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("blockstore")
diff --git a/blocks/blockstore/write_cache.go b/blocks/blockstore/write_cache.go
index 55ff4a1d98c09dfe9e5065547883c582fae4d043..90109e8a2bdce36926b493602ffacb342d0a70f5 100644
--- a/blocks/blockstore/write_cache.go
+++ b/blocks/blockstore/write_cache.go
@@ -2,9 +2,9 @@ package blockstore
import (
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/hashicorp/golang-lru"
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
"github.com/ipfs/go-ipfs/blocks"
key "github.com/ipfs/go-ipfs/blocks/key"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
// WriteCached returns a blockstore that caches up to |size| unique writes (bs.Put).
diff --git a/blocks/set/set.go b/blocks/set/set.go
index 0c087849e3db89f01fa07ceacfd1eced62d6d691..ccecff83bf866565a1f62dd955c5621454d12866 100644
--- a/blocks/set/set.go
+++ b/blocks/set/set.go
@@ -4,7 +4,7 @@ package set
import (
"github.com/ipfs/go-ipfs/blocks/bloom"
key "github.com/ipfs/go-ipfs/blocks/key"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("blockset")
diff --git a/blockservice/blockservice.go b/blockservice/blockservice.go
index 3f17e249aeb94a238eb6c2b2d13099bac7049df2..21af30dfbe39e13e0a2b292029e4f4f6c749bb13 100644
--- a/blockservice/blockservice.go
+++ b/blockservice/blockservice.go
@@ -11,7 +11,7 @@ import (
key "github.com/ipfs/go-ipfs/blocks/key"
exchange "github.com/ipfs/go-ipfs/exchange"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("blockservice")
diff --git a/blockservice/test/blocks_test.go b/blockservice/test/blocks_test.go
index 4c6dca16ce1990c015dc9fd548442510cb1afcce..8cd5e6dfb950980d4d28138fa6ddd3ed444890ab 100644
--- a/blockservice/test/blocks_test.go
+++ b/blockservice/test/blocks_test.go
@@ -7,7 +7,6 @@ import (
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"
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
blocks "github.com/ipfs/go-ipfs/blocks"
blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
blocksutil "github.com/ipfs/go-ipfs/blocks/blocksutil"
@@ -15,6 +14,7 @@ import (
. "github.com/ipfs/go-ipfs/blockservice"
offline "github.com/ipfs/go-ipfs/exchange/offline"
u "github.com/ipfs/go-ipfs/util"
+ "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
func TestBlocks(t *testing.T) {
diff --git a/cmd/ipfs/init.go b/cmd/ipfs/init.go
index ede9e25a780d9d1d979f896e03e2958ff43e71ed..2861901fb971c9401fa047e82e0de6170a4e3b07 100644
--- a/cmd/ipfs/init.go
+++ b/cmd/ipfs/init.go
@@ -7,13 +7,13 @@ import (
"os"
"path"
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
assets "github.com/ipfs/go-ipfs/assets"
cmds "github.com/ipfs/go-ipfs/commands"
core "github.com/ipfs/go-ipfs/core"
namesys "github.com/ipfs/go-ipfs/namesys"
config "github.com/ipfs/go-ipfs/repo/config"
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
const nBitsForKeypairDefault = 2048
diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go
index 400e47a5fb5c90f69da14fbb358b75d66e611fa2..c3f2f0340b3b3aa9e42fc014be6cd0301f568577 100644
--- a/cmd/ipfs/main.go
+++ b/cmd/ipfs/main.go
@@ -20,7 +20,6 @@ import (
ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net"
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
cmds "github.com/ipfs/go-ipfs/commands"
cmdsCli "github.com/ipfs/go-ipfs/commands/cli"
cmdsHttp "github.com/ipfs/go-ipfs/commands/http"
@@ -30,7 +29,8 @@ import (
config "github.com/ipfs/go-ipfs/repo/config"
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
u "github.com/ipfs/go-ipfs/util"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
// log is the command logger
diff --git a/cmd/ipfswatch/main.go b/cmd/ipfswatch/main.go
index d695d137dc145a533146ca416f011d08bf9d3ed4..3c03c6b0fad657d4f55c73824f0089e4eef58bda 100644
--- a/cmd/ipfswatch/main.go
+++ b/cmd/ipfswatch/main.go
@@ -9,7 +9,6 @@ import (
process "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
homedir "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/mitchellh/go-homedir"
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
fsnotify "github.com/ipfs/go-ipfs/Godeps/_workspace/src/gopkg.in/fsnotify.v1"
commands "github.com/ipfs/go-ipfs/commands"
core "github.com/ipfs/go-ipfs/core"
@@ -17,6 +16,7 @@ import (
coreunix "github.com/ipfs/go-ipfs/core/coreunix"
config "github.com/ipfs/go-ipfs/repo/config"
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
var http = flag.Bool("http", false, "expose IPFS HTTP API")
diff --git a/cmd/seccat/seccat.go b/cmd/seccat/seccat.go
index 28d7a160e8f1a7c30b0a7f4fc6ecf55e22575121..0287576a1aa1ccbe0c082cd5337828b615e644b3 100644
--- a/cmd/seccat/seccat.go
+++ b/cmd/seccat/seccat.go
@@ -22,7 +22,7 @@ import (
secio "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/crypto/secio"
peer "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/peer"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var verbose = false
diff --git a/cmd/seccat/util.go b/cmd/seccat/util.go
index 570bc91c846b562420857413d77cebc7f5215324..433e8b5150874d485fea7cb16bc40a49a839b75f 100644
--- a/cmd/seccat/util.go
+++ b/cmd/seccat/util.go
@@ -5,7 +5,7 @@ import (
"io"
"os"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("seccat")
diff --git a/commands/command.go b/commands/command.go
index 48bc2b39cc49633372ecaf4628f83efbad4e51dc..0b460d184fc3acd4857860b91712a0135a4fabba 100644
--- a/commands/command.go
+++ b/commands/command.go
@@ -15,7 +15,7 @@ import (
"reflect"
"github.com/ipfs/go-ipfs/path"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("command")
diff --git a/commands/http/handler.go b/commands/http/handler.go
index b6fdf50a658fd9804c46f53f5ce0ba808e143a2c..833c70a0d54fd65bb2325a7c9ce79764b6618c52 100644
--- a/commands/http/handler.go
+++ b/commands/http/handler.go
@@ -12,11 +12,11 @@ import (
"sync"
cors "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/rs/cors"
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
"github.com/ipfs/go-ipfs/repo/config"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
cmds "github.com/ipfs/go-ipfs/commands"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("commands/http")
@@ -201,8 +201,8 @@ func guessMimeType(res cmds.Response) (string, error) {
func sendResponse(w http.ResponseWriter, r *http.Request, res cmds.Response, req cmds.Request) {
h := w.Header()
// Expose our agent to allow identification
- h.Set("Server", "go-ipfs/" + config.CurrentVersionNumber)
-
+ h.Set("Server", "go-ipfs/"+config.CurrentVersionNumber)
+
mime, err := guessMimeType(res)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
diff --git a/commands/request.go b/commands/request.go
index 1565ed132eb2ba76594e6d9d67d5b5fa279506f1..9e5c295d18c20ceeec1520ddc258624bb56446cc 100644
--- a/commands/request.go
+++ b/commands/request.go
@@ -9,11 +9,11 @@ import (
"strconv"
"time"
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
"github.com/ipfs/go-ipfs/commands/files"
"github.com/ipfs/go-ipfs/core"
"github.com/ipfs/go-ipfs/repo/config"
u "github.com/ipfs/go-ipfs/util"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
type OptMap map[string]interface{}
diff --git a/core/commands/files/files.go b/core/commands/files/files.go
index 94a7e839a89a1eff1ae185f979256aef6dcdc380..eb17c674eba96ec4a047e8abb1d90f86440d117c 100644
--- a/core/commands/files/files.go
+++ b/core/commands/files/files.go
@@ -17,7 +17,7 @@ import (
ft "github.com/ipfs/go-ipfs/unixfs"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("cmds/files")
diff --git a/core/commands/log.go b/core/commands/log.go
index e4ad50949cda0158f62c6e99f0c460bbc123bf36..ec53c853b213f278bf398ef352dbcadf6c8f8874 100644
--- a/core/commands/log.go
+++ b/core/commands/log.go
@@ -5,7 +5,7 @@ import (
"io"
cmds "github.com/ipfs/go-ipfs/commands"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
// Golang os.Args overrides * and replaces the character argument with
diff --git a/core/commands/pin.go b/core/commands/pin.go
index 1f349cb4da6f8f3fab3790b01986eec68df78a6c..55262e3715de0f3f2ace2bc0273dffde87f2b4ea 100644
--- a/core/commands/pin.go
+++ b/core/commands/pin.go
@@ -7,12 +7,12 @@ import (
key "github.com/ipfs/go-ipfs/blocks/key"
cmds "github.com/ipfs/go-ipfs/commands"
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
core "github.com/ipfs/go-ipfs/core"
corerepo "github.com/ipfs/go-ipfs/core/corerepo"
dag "github.com/ipfs/go-ipfs/merkledag"
path "github.com/ipfs/go-ipfs/path"
u "github.com/ipfs/go-ipfs/util"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
var PinCmd = &cmds.Command{
diff --git a/core/commands/refs.go b/core/commands/refs.go
index 5a6f8ed7bb3f7ebd1cc8c3595a318e46706fa75d..02d53e4f5a86d26721ca2c0311c2645c8bcffdf7 100644
--- a/core/commands/refs.go
+++ b/core/commands/refs.go
@@ -7,13 +7,13 @@ import (
"io"
"strings"
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
key "github.com/ipfs/go-ipfs/blocks/key"
cmds "github.com/ipfs/go-ipfs/commands"
"github.com/ipfs/go-ipfs/core"
dag "github.com/ipfs/go-ipfs/merkledag"
path "github.com/ipfs/go-ipfs/path"
u "github.com/ipfs/go-ipfs/util"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
// KeyList is a general type for outputting lists of keys
diff --git a/core/commands/root.go b/core/commands/root.go
index 7f69310ddd3c3c797a9e8d83fb703b57719c206f..91e007b37952bc7a4f9e2439fedf61206e942272 100644
--- a/core/commands/root.go
+++ b/core/commands/root.go
@@ -8,7 +8,7 @@ import (
files "github.com/ipfs/go-ipfs/core/commands/files"
ocmd "github.com/ipfs/go-ipfs/core/commands/object"
unixfs "github.com/ipfs/go-ipfs/core/commands/unixfs"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("core/commands")
diff --git a/core/commands/sysdiag.go b/core/commands/sysdiag.go
index 4cc7681f47958bdb18e4baf8d0d3d1c05d172120..06b1e2a651ca7654ecc17f936d5c3e98f2b9b223 100644
--- a/core/commands/sysdiag.go
+++ b/core/commands/sysdiag.go
@@ -8,8 +8,8 @@ import (
cmds "github.com/ipfs/go-ipfs/commands"
config "github.com/ipfs/go-ipfs/repo/config"
- manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net"
sysi "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/whyrusleeping/go-sysinfo"
+ manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net"
)
var sysDiagCmd = &cmds.Command{
diff --git a/core/core.go b/core/core.go
index 2669a2dd7142603c081f1cae7b8d76414f13015e..827be722ae35f19bf91f01815f9d41d9f71c6f7c 100644
--- a/core/core.go
+++ b/core/core.go
@@ -33,7 +33,7 @@ import (
peer "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/peer"
ping "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/protocol/ping"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
routing "github.com/ipfs/go-ipfs/routing"
dht "github.com/ipfs/go-ipfs/routing/dht"
diff --git a/core/core_test.go b/core/core_test.go
index dcfc839bf74417679e83ce71b3037129535ac774..027a721d03c68db24e819217cf8345c2b6a54ad9 100644
--- a/core/core_test.go
+++ b/core/core_test.go
@@ -3,10 +3,10 @@ package core
import (
"testing"
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
"github.com/ipfs/go-ipfs/repo"
config "github.com/ipfs/go-ipfs/repo/config"
"github.com/ipfs/go-ipfs/util/testutil"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
func TestInitialization(t *testing.T) {
diff --git a/core/corehttp/corehttp.go b/core/corehttp/corehttp.go
index cfccd7bc4ecac112b7bbddfa081601fdbae03fdc..ed14165ced89a11ea99249a0b0eda10c8fa53c86 100644
--- a/core/corehttp/corehttp.go
+++ b/core/corehttp/corehttp.go
@@ -10,11 +10,11 @@ import (
"net/http"
"time"
- ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
- manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net"
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
core "github.com/ipfs/go-ipfs/core"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
+ manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("core/server")
diff --git a/core/corehttp/ipns_hostname.go b/core/corehttp/ipns_hostname.go
index 3e768fa455f6fa7fbbace607ec502c401eed0ce5..c6b14404008635bbf75fe8222976e7a91054f31c 100644
--- a/core/corehttp/ipns_hostname.go
+++ b/core/corehttp/ipns_hostname.go
@@ -6,8 +6,8 @@ import (
"strings"
isd "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-is-domain"
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
"github.com/ipfs/go-ipfs/core"
+ "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
// IPNSHostnameOption rewrites an incoming request if its Host: header contains
diff --git a/core/corehttp/logs.go b/core/corehttp/logs.go
index 11a7223b476f8b868c129f884843322793086363..82bd2ab799ce6ff975b9128267bd608bc7312125 100644
--- a/core/corehttp/logs.go
+++ b/core/corehttp/logs.go
@@ -6,7 +6,7 @@ import (
"net/http"
core "github.com/ipfs/go-ipfs/core"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
type writeErrNotifier struct {
diff --git a/core/corerepo/gc.go b/core/corerepo/gc.go
index fa93fd083da5453f358f907e3e102aa7e31f13c6..6210f16e8a7016b5a24c5ecbacdcf7bdd6424431 100644
--- a/core/corerepo/gc.go
+++ b/core/corerepo/gc.go
@@ -5,12 +5,12 @@ import (
"time"
humanize "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/dustin/go-humanize"
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
key "github.com/ipfs/go-ipfs/blocks/key"
"github.com/ipfs/go-ipfs/core"
gc "github.com/ipfs/go-ipfs/pin/gc"
repo "github.com/ipfs/go-ipfs/repo"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("corerepo")
diff --git a/core/coreunix/add.go b/core/coreunix/add.go
index 75d0dbd09be5fe8a6f7265b2281024402834d254..a7f6951162c253d8ebcc9f632f00af3992345b9e 100644
--- a/core/coreunix/add.go
+++ b/core/coreunix/add.go
@@ -10,7 +10,6 @@ import (
ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
syncds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore/sync"
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
bstore "github.com/ipfs/go-ipfs/blocks/blockstore"
key "github.com/ipfs/go-ipfs/blocks/key"
bserv "github.com/ipfs/go-ipfs/blockservice"
@@ -19,12 +18,13 @@ import (
"github.com/ipfs/go-ipfs/importer/chunk"
mfs "github.com/ipfs/go-ipfs/mfs"
"github.com/ipfs/go-ipfs/pin"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
"github.com/ipfs/go-ipfs/commands/files"
core "github.com/ipfs/go-ipfs/core"
dag "github.com/ipfs/go-ipfs/merkledag"
unixfs "github.com/ipfs/go-ipfs/unixfs"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("coreunix")
diff --git a/core/coreunix/add_test.go b/core/coreunix/add_test.go
index d0f923c111692b72620d100155d46827e54f31f9..f2b2b212d371b7e107a231c5ad0eba035e459253 100644
--- a/core/coreunix/add_test.go
+++ b/core/coreunix/add_test.go
@@ -7,7 +7,6 @@ import (
"testing"
"time"
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
"github.com/ipfs/go-ipfs/blocks/key"
"github.com/ipfs/go-ipfs/commands/files"
"github.com/ipfs/go-ipfs/core"
@@ -16,6 +15,7 @@ import (
"github.com/ipfs/go-ipfs/repo"
"github.com/ipfs/go-ipfs/repo/config"
"github.com/ipfs/go-ipfs/util/testutil"
+ "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
func TestAddRecursive(t *testing.T) {
diff --git a/core/coreunix/cat.go b/core/coreunix/cat.go
index 4ef4fcef346515ae9b4bcb97083eed0402f7dcc2..74119b0f4cbadd4a5710d3f21aaac281a1d2fd0f 100644
--- a/core/coreunix/cat.go
+++ b/core/coreunix/cat.go
@@ -1,10 +1,10 @@
package coreunix
import (
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
core "github.com/ipfs/go-ipfs/core"
path "github.com/ipfs/go-ipfs/path"
uio "github.com/ipfs/go-ipfs/unixfs/io"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
func Cat(ctx context.Context, n *core.IpfsNode, pstr string) (*uio.DagReader, error) {
diff --git a/diagnostics/diag.go b/diagnostics/diag.go
index dd33d86ca43c449e64d1978162c1fe7e09d2d947..b5a275dc1dd3ad34f4aec1a557b76e1289d19a2a 100644
--- a/diagnostics/diag.go
+++ b/diagnostics/diag.go
@@ -20,7 +20,7 @@ import (
peer "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/peer"
protocol "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/protocol"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("diagnostics")
diff --git a/exchange/bitswap/bitswap.go b/exchange/bitswap/bitswap.go
index 3a0557e90c304d0ab1dfb206867f2a894756e7ec..b1b1187c4829002fd7b125dec4355bcc07c3a7e4 100644
--- a/exchange/bitswap/bitswap.go
+++ b/exchange/bitswap/bitswap.go
@@ -22,7 +22,7 @@ import (
"github.com/ipfs/go-ipfs/thirdparty/delay"
peer "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/peer"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("bitswap")
diff --git a/exchange/bitswap/decision/engine.go b/exchange/bitswap/decision/engine.go
index f303ef64c4540044a1f3095304e1063622ab48f9..55cc90b96b7c150e6908f3ac0587eee9f56258fa 100644
--- a/exchange/bitswap/decision/engine.go
+++ b/exchange/bitswap/decision/engine.go
@@ -10,7 +10,7 @@ import (
wl "github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
peer "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/peer"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
// TODO consider taking responsibility for other types of requests. For
diff --git a/exchange/bitswap/network/ipfs_impl.go b/exchange/bitswap/network/ipfs_impl.go
index 179497b0abdcbc828bcf19e877e5f375301a1e35..e02c68003f74d9914f2b0db93ae6c5e8b4c310a1 100644
--- a/exchange/bitswap/network/ipfs_impl.go
+++ b/exchange/bitswap/network/ipfs_impl.go
@@ -9,7 +9,7 @@ import (
inet "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/net"
peer "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/peer"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("bitswap_network")
diff --git a/exchange/bitswap/notifications/notifications.go b/exchange/bitswap/notifications/notifications.go
index 79479b84d0f04b0d664cf08f320120e06ad32cbb..8a83bba9b3106aa1431c1ab939a974286e9fbde3 100644
--- a/exchange/bitswap/notifications/notifications.go
+++ b/exchange/bitswap/notifications/notifications.go
@@ -2,9 +2,9 @@ package notifications
import (
pubsub "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/briantigerchow/pubsub"
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
blocks "github.com/ipfs/go-ipfs/blocks"
key "github.com/ipfs/go-ipfs/blocks/key"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
const bufferSize = 16
diff --git a/exchange/bitswap/notifications/notifications_test.go b/exchange/bitswap/notifications/notifications_test.go
index 36b156969c2b041759c8da58c1ee5445e482ca0a..02acbd13fed86c3a1b6b463d648395a261b0415d 100644
--- a/exchange/bitswap/notifications/notifications_test.go
+++ b/exchange/bitswap/notifications/notifications_test.go
@@ -5,10 +5,10 @@ import (
"testing"
"time"
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
blocks "github.com/ipfs/go-ipfs/blocks"
blocksutil "github.com/ipfs/go-ipfs/blocks/blocksutil"
key "github.com/ipfs/go-ipfs/blocks/key"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
func TestDuplicates(t *testing.T) {
diff --git a/exchange/bitswap/workers.go b/exchange/bitswap/workers.go
index ea066a242fd4b5151859aaa36d95746ca1a5738e..b9dc963beddec607f3a0e6b4a2da43a425ad6d74 100644
--- a/exchange/bitswap/workers.go
+++ b/exchange/bitswap/workers.go
@@ -8,7 +8,7 @@ import (
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
key "github.com/ipfs/go-ipfs/blocks/key"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var TaskWorkerCount = 8
diff --git a/exchange/interface.go b/exchange/interface.go
index 0f38f86b36e8aacbe63bedd4ab9b98a6cf368b72..32954b8621d4074dd878167496767830d2f25d56 100644
--- a/exchange/interface.go
+++ b/exchange/interface.go
@@ -4,9 +4,9 @@ package exchange
import (
"io"
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
blocks "github.com/ipfs/go-ipfs/blocks"
key "github.com/ipfs/go-ipfs/blocks/key"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
// Any type that implements exchange.Interface may be used as an IPFS block
diff --git a/exchange/offline/offline.go b/exchange/offline/offline.go
index 47e555e2601a7c370e857e283de33e7ee5cd18f2..8f857d933182d54fb757cc000860ef2f20c1df8e 100644
--- a/exchange/offline/offline.go
+++ b/exchange/offline/offline.go
@@ -3,11 +3,11 @@
package offline
import (
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
blocks "github.com/ipfs/go-ipfs/blocks"
"github.com/ipfs/go-ipfs/blocks/blockstore"
key "github.com/ipfs/go-ipfs/blocks/key"
exchange "github.com/ipfs/go-ipfs/exchange"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
func Exchange(bs blockstore.Blockstore) exchange.Interface {
diff --git a/exchange/offline/offline_test.go b/exchange/offline/offline_test.go
index 407865703ac41c9a16da0b59dee3504665c5daff..d7d17341e933e0b42dc705e48a2ee138fb79a333 100644
--- a/exchange/offline/offline_test.go
+++ b/exchange/offline/offline_test.go
@@ -5,11 +5,11 @@ import (
ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
ds_sync "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore/sync"
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
blocks "github.com/ipfs/go-ipfs/blocks"
"github.com/ipfs/go-ipfs/blocks/blockstore"
"github.com/ipfs/go-ipfs/blocks/blocksutil"
key "github.com/ipfs/go-ipfs/blocks/key"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
func TestBlockReturnsErr(t *testing.T) {
diff --git a/exchange/reprovide/reprovide.go b/exchange/reprovide/reprovide.go
index b80e404e7b6c4655902a39a47ccf3302a47403aa..ca027b4aff5d042f6f4f0f41a0b00c71ad9b8917 100644
--- a/exchange/reprovide/reprovide.go
+++ b/exchange/reprovide/reprovide.go
@@ -5,10 +5,10 @@ import (
"time"
backoff "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/cenkalti/backoff"
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
blocks "github.com/ipfs/go-ipfs/blocks/blockstore"
routing "github.com/ipfs/go-ipfs/routing"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("reprovider")
diff --git a/exchange/reprovide/reprovide_test.go b/exchange/reprovide/reprovide_test.go
index b420be87f8c6c309c5bcb526baf97bf37c33e106..ea49ed93217f01f700afac420aee8f2007a87e96 100644
--- a/exchange/reprovide/reprovide_test.go
+++ b/exchange/reprovide/reprovide_test.go
@@ -5,11 +5,11 @@ import (
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"
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
blocks "github.com/ipfs/go-ipfs/blocks"
blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
mock "github.com/ipfs/go-ipfs/routing/mock"
testutil "github.com/ipfs/go-ipfs/util/testutil"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
. "github.com/ipfs/go-ipfs/exchange/reprovide"
)
diff --git a/fuse/ipns/ipns_test.go b/fuse/ipns/ipns_test.go
index 223fe5a84beff2533797e5619cf6cf4dcb474638..df11624cecd66c198b865771ba124d5f3123e358 100644
--- a/fuse/ipns/ipns_test.go
+++ b/fuse/ipns/ipns_test.go
@@ -14,8 +14,8 @@ import (
fstest "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil"
racedet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-detect-race"
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
core "github.com/ipfs/go-ipfs/core"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
//mfs "github.com/ipfs/go-ipfs/mfs"
namesys "github.com/ipfs/go-ipfs/namesys"
offroute "github.com/ipfs/go-ipfs/routing/offline"
diff --git a/fuse/ipns/ipns_unix.go b/fuse/ipns/ipns_unix.go
index 4b0fe55797aacbed56d10f1500f9abfafb7892f7..e3f8b316f8d015057a9b539fcd079c1fbb9d13cc 100644
--- a/fuse/ipns/ipns_unix.go
+++ b/fuse/ipns/ipns_unix.go
@@ -12,7 +12,7 @@ import (
fuse "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
fs "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
key "github.com/ipfs/go-ipfs/blocks/key"
core "github.com/ipfs/go-ipfs/core"
diff --git a/fuse/mount/mount.go b/fuse/mount/mount.go
index bcaffedc37fedd499f1605ab829e7320f0f7e06d..4404fa6e762f36fff47dd58718c2ca37728cf3e2 100644
--- a/fuse/mount/mount.go
+++ b/fuse/mount/mount.go
@@ -10,7 +10,7 @@ import (
goprocess "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("mount")
diff --git a/fuse/readonly/readonly_unix.go b/fuse/readonly/readonly_unix.go
index 3e929da785492ebb792b0e34734530cdf0e98e92..7384e62c7d19c24e35e42504a5f397ff1b94eb58 100644
--- a/fuse/readonly/readonly_unix.go
+++ b/fuse/readonly/readonly_unix.go
@@ -12,14 +12,14 @@ import (
fuse "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
fs "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto"
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
core "github.com/ipfs/go-ipfs/core"
mdag "github.com/ipfs/go-ipfs/merkledag"
path "github.com/ipfs/go-ipfs/path"
uio "github.com/ipfs/go-ipfs/unixfs/io"
ftpb "github.com/ipfs/go-ipfs/unixfs/pb"
lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("fuse/ipfs")
diff --git a/importer/balanced/balanced_test.go b/importer/balanced/balanced_test.go
index 2138352abc16181c168fd9daa9179a033436d460..2182615c5fde0dcd9b638b0e0cd1b67608e973be 100644
--- a/importer/balanced/balanced_test.go
+++ b/importer/balanced/balanced_test.go
@@ -9,7 +9,6 @@ import (
"os"
"testing"
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
chunk "github.com/ipfs/go-ipfs/importer/chunk"
h "github.com/ipfs/go-ipfs/importer/helpers"
dag "github.com/ipfs/go-ipfs/merkledag"
@@ -17,6 +16,7 @@ import (
pin "github.com/ipfs/go-ipfs/pin"
uio "github.com/ipfs/go-ipfs/unixfs/io"
u "github.com/ipfs/go-ipfs/util"
+ "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
// TODO: extract these tests and more as a generic layout test suite
diff --git a/importer/chunk/splitting.go b/importer/chunk/splitting.go
index 84545cdfcae881a549697f24a74d0ba44fa709d8..3b539fe7bf95275058f192d8fb1ed84efd558639 100644
--- a/importer/chunk/splitting.go
+++ b/importer/chunk/splitting.go
@@ -4,7 +4,7 @@ package chunk
import (
"io"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("chunk")
diff --git a/importer/helpers/helpers.go b/importer/helpers/helpers.go
index 6bd4e7652e6a427547270a2ae95e37b785c5e7fd..29983795c5f516badfd3782b647770312bae308a 100644
--- a/importer/helpers/helpers.go
+++ b/importer/helpers/helpers.go
@@ -3,10 +3,10 @@ package helpers
import (
"fmt"
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
chunk "github.com/ipfs/go-ipfs/importer/chunk"
dag "github.com/ipfs/go-ipfs/merkledag"
ft "github.com/ipfs/go-ipfs/unixfs"
+ "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
// BlockSizeLimit specifies the maximum size an imported block can have.
diff --git a/importer/importer.go b/importer/importer.go
index 4178c45ad63b1235b3b71b99ab5ca72ad051f189..d8b063d99dcccf2532917a02659f658b126d2ac6 100644
--- a/importer/importer.go
+++ b/importer/importer.go
@@ -12,7 +12,7 @@ import (
h "github.com/ipfs/go-ipfs/importer/helpers"
trickle "github.com/ipfs/go-ipfs/importer/trickle"
dag "github.com/ipfs/go-ipfs/merkledag"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("importer")
diff --git a/importer/importer_test.go b/importer/importer_test.go
index cb82b05d121f2a0b55741a075a04445cdc14378f..306e6221966785f9e8a096d970e85fa1f032a9af 100644
--- a/importer/importer_test.go
+++ b/importer/importer_test.go
@@ -6,12 +6,12 @@ import (
"io/ioutil"
"testing"
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
chunk "github.com/ipfs/go-ipfs/importer/chunk"
dag "github.com/ipfs/go-ipfs/merkledag"
mdtest "github.com/ipfs/go-ipfs/merkledag/test"
uio "github.com/ipfs/go-ipfs/unixfs/io"
u "github.com/ipfs/go-ipfs/util"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
func getBalancedDag(t testing.TB, size int64, blksize int64) (*dag.Node, dag.DAGService) {
diff --git a/importer/trickle/trickle_test.go b/importer/trickle/trickle_test.go
index 57eb6544045eb7518abfc75349ee48d957f753bc..9581907ffd65d75a18841cf043a08aff8ca3562f 100644
--- a/importer/trickle/trickle_test.go
+++ b/importer/trickle/trickle_test.go
@@ -9,7 +9,6 @@ import (
"os"
"testing"
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
chunk "github.com/ipfs/go-ipfs/importer/chunk"
h "github.com/ipfs/go-ipfs/importer/helpers"
merkledag "github.com/ipfs/go-ipfs/merkledag"
@@ -18,6 +17,7 @@ import (
ft "github.com/ipfs/go-ipfs/unixfs"
uio "github.com/ipfs/go-ipfs/unixfs/io"
u "github.com/ipfs/go-ipfs/util"
+ "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
func buildTestDag(ds merkledag.DAGService, spl chunk.Splitter) (*merkledag.Node, error) {
diff --git a/merkledag/merkledag.go b/merkledag/merkledag.go
index 21ce1422a25bc73db71bdb91687861e5b02c8a1a..e324ceb883a712099cebcf14138f20a4f52e5541 100644
--- a/merkledag/merkledag.go
+++ b/merkledag/merkledag.go
@@ -4,11 +4,11 @@ package merkledag
import (
"fmt"
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
blocks "github.com/ipfs/go-ipfs/blocks"
key "github.com/ipfs/go-ipfs/blocks/key"
bserv "github.com/ipfs/go-ipfs/blockservice"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("merkledag")
diff --git a/merkledag/merkledag_test.go b/merkledag/merkledag_test.go
index 58d8eadc83ac3c588626bbce284a255bbf4a64b3..d9622082e03118aa40117980899773af368fe670 100644
--- a/merkledag/merkledag_test.go
+++ b/merkledag/merkledag_test.go
@@ -12,7 +12,6 @@ import (
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"
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
bstore "github.com/ipfs/go-ipfs/blocks/blockstore"
key "github.com/ipfs/go-ipfs/blocks/key"
bserv "github.com/ipfs/go-ipfs/blockservice"
@@ -24,6 +23,7 @@ import (
"github.com/ipfs/go-ipfs/pin"
uio "github.com/ipfs/go-ipfs/unixfs/io"
u "github.com/ipfs/go-ipfs/util"
+ "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
type dagservAndPinner struct {
diff --git a/merkledag/utils/diff.go b/merkledag/utils/diff.go
index 58eeef3987ec24c11cf191f8e9fe81e8c5bb483e..3237ad913c16f82b032f7dfb4cec6ac9728be454 100644
--- a/merkledag/utils/diff.go
+++ b/merkledag/utils/diff.go
@@ -5,9 +5,9 @@ import (
"fmt"
"path"
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
key "github.com/ipfs/go-ipfs/blocks/key"
dag "github.com/ipfs/go-ipfs/merkledag"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
const (
diff --git a/mfs/mfs_test.go b/mfs/mfs_test.go
index 0cf8b639e1119ecc5aeb547a1e140262e2edd753..917845f5afa6d6bdc7bb16ace4fc5a52dcc0d92b 100644
--- a/mfs/mfs_test.go
+++ b/mfs/mfs_test.go
@@ -14,8 +14,8 @@ import (
randbo "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/dustin/randbo"
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"
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
"github.com/ipfs/go-ipfs/path"
+ "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
bstore "github.com/ipfs/go-ipfs/blocks/blockstore"
key "github.com/ipfs/go-ipfs/blocks/key"
diff --git a/mfs/system.go b/mfs/system.go
index 4b9afed7d5f7ac8a63fd46d07435ccf94ffdee6c..c059bf5ce5ad715e75aa9eba256cac58a0e8cb34 100644
--- a/mfs/system.go
+++ b/mfs/system.go
@@ -19,7 +19,7 @@ import (
ft "github.com/ipfs/go-ipfs/unixfs"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var ErrNotExist = errors.New("no such rootfs")
diff --git a/namesys/proquint.go b/namesys/proquint.go
index 8dbf4a19af5f10ddaed4b964ec29cebd8d2ae13d..ce17181e83f8445c4f5a04f5af9d2e184b79eb55 100644
--- a/namesys/proquint.go
+++ b/namesys/proquint.go
@@ -4,8 +4,8 @@ import (
"errors"
proquint "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/bren2010/proquint"
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
path "github.com/ipfs/go-ipfs/path"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
type ProquintResolver struct{}
diff --git a/namesys/republisher/repub.go b/namesys/republisher/repub.go
index cf2608651bc23b6c3ce96c4adb0bce091b9edf15..60ce8cd0d511f2803a27f1ac9affe955d7f04823 100644
--- a/namesys/republisher/repub.go
+++ b/namesys/republisher/repub.go
@@ -18,7 +18,7 @@ import (
goprocess "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
gpctx "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess/context"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var errNoEntry = errors.New("no previous entry")
diff --git a/namesys/routing.go b/namesys/routing.go
index 23334e48a883aea6f0ec888e2bd8fca8b883a940..f814ef165894767dccdc642753a1736d95c8ff35 100644
--- a/namesys/routing.go
+++ b/namesys/routing.go
@@ -15,7 +15,7 @@ import (
routing "github.com/ipfs/go-ipfs/routing"
u "github.com/ipfs/go-ipfs/util"
ci "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/crypto"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("namesys")
diff --git a/package.json b/package.json
index de3325930a5ee19757a11851bfde27fe2c3fca22..f774f19a9915d083cfa9e2c19c0a7e2d809b62f1 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
"gxDependencies": [
{
"name": "go-log",
- "hash": "QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi",
+ "hash": "Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH",
"version": "1.0.0"
},
{
@@ -15,4 +15,4 @@
],
"language": "go",
"issues_url": "https://github.com/ipfs/go-ipfs"
-}
\ No newline at end of file
+}
diff --git a/path/resolver.go b/path/resolver.go
index d4e68a1bffc9f989e26c1a05b6b97b48ac8e2723..569a4d1be72a852deb422d5e65c6e941c9c373a2 100644
--- a/path/resolver.go
+++ b/path/resolver.go
@@ -11,7 +11,7 @@ import (
key "github.com/ipfs/go-ipfs/blocks/key"
merkledag "github.com/ipfs/go-ipfs/merkledag"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("path")
diff --git a/pin/gc/gc.go b/pin/gc/gc.go
index daa082f91932453bf56d08924bd053ff2b730356..8586e2b9bb846cdf92c72917fdd9a14b63685919 100644
--- a/pin/gc/gc.go
+++ b/pin/gc/gc.go
@@ -9,7 +9,7 @@ import (
pin "github.com/ipfs/go-ipfs/pin"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("gc")
diff --git a/pin/pin.go b/pin/pin.go
index cd17daba75907f6a5b76aeae071be26a0ac55569..fb6269d3ebe1073d1e0865bcd39ff79bf83d178f 100644
--- a/pin/pin.go
+++ b/pin/pin.go
@@ -8,11 +8,11 @@ import (
"time"
ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
- 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 "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("pin")
diff --git a/pin/set.go b/pin/set.go
index 9188f4d56cf927f23da58c6f532131fb55808a15..a07762a31957a9d79f19a7591c98187eb3222d5a 100644
--- a/pin/set.go
+++ b/pin/set.go
@@ -12,10 +12,10 @@ import (
"unsafe"
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto"
- "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"
+ "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
const (
diff --git a/pin/set_test.go b/pin/set_test.go
index eb796d9190f9dfce59978f4759adb33d65fb6014..3ef7ce51ba08cf40c960d919805f0ce632dc7549 100644
--- a/pin/set_test.go
+++ b/pin/set_test.go
@@ -6,12 +6,12 @@ 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"
- "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"
"github.com/ipfs/go-ipfs/exchange/offline"
"github.com/ipfs/go-ipfs/merkledag"
+ "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
func ignoreKeys(key.Key) {}
diff --git a/repo/config/config.go b/repo/config/config.go
index 8ea2dbd28a9b4b2b9efa344227f57d564d0be2a8..7628025616476f204d15fb0eb36e783a0d1d16a2 100644
--- a/repo/config/config.go
+++ b/repo/config/config.go
@@ -10,7 +10,7 @@ import (
"strings"
u "github.com/ipfs/go-ipfs/util"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("config")
diff --git a/repo/fsrepo/fsrepo.go b/repo/fsrepo/fsrepo.go
index 3cae438cb8d37d22c985c8f77a1a1f541e44fe78..92ee880a3aa8b25af2bc2be72d277ff2f7980cc4 100644
--- a/repo/fsrepo/fsrepo.go
+++ b/repo/fsrepo/fsrepo.go
@@ -20,7 +20,7 @@ import (
serialize "github.com/ipfs/go-ipfs/repo/fsrepo/serialize"
dir "github.com/ipfs/go-ipfs/thirdparty/dir"
util "github.com/ipfs/go-ipfs/util"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("fsrepo")
diff --git a/repo/fsrepo/serialize/serialize.go b/repo/fsrepo/serialize/serialize.go
index a13216babef4004b75c7751226973d6b28ac0459..64e897b78c9490b1614fca99746054fb5d6d0957 100644
--- a/repo/fsrepo/serialize/serialize.go
+++ b/repo/fsrepo/serialize/serialize.go
@@ -11,7 +11,7 @@ import (
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/facebookgo/atomicfile"
"github.com/ipfs/go-ipfs/repo/config"
"github.com/ipfs/go-ipfs/util"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("fsrepo")
diff --git a/routing/dht/dht.go b/routing/dht/dht.go
index 8c9060a0d51fa39e92b21ffd8fb8fdc398e069d2..1742e58fc50d35e66b3e74c6032adbb4068a725c 100644
--- a/routing/dht/dht.go
+++ b/routing/dht/dht.go
@@ -18,7 +18,7 @@ import (
host "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/host"
peer "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/peer"
protocol "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/protocol"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto"
ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
diff --git a/routing/dht/pb/message.go b/routing/dht/pb/message.go
index 177134991fcb8e6b1b1642dcd936a8b94cd0bd18..ae2cbb398fabefda1b712281663f6c34eeff11c2 100644
--- a/routing/dht/pb/message.go
+++ b/routing/dht/pb/message.go
@@ -6,7 +6,7 @@ import (
key "github.com/ipfs/go-ipfs/blocks/key"
inet "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/net"
peer "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/peer"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("dht.pb")
diff --git a/routing/dht/query.go b/routing/dht/query.go
index c520e738d58c1a2ad489085d453e2c8b93e6ddde..c7c5b2f0ea45ac3248336627939df438680ef97b 100644
--- a/routing/dht/query.go
+++ b/routing/dht/query.go
@@ -11,7 +11,7 @@ import (
todoctr "github.com/ipfs/go-ipfs/util/todocounter"
peer "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/peer"
queue "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/peer/queue"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
process "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
ctxproc "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess/context"
diff --git a/routing/kbucket/table.go b/routing/kbucket/table.go
index 2386fd103b1fa5a2511d070b5e806f463306a272..e849ed38e55a23eb4bdf110984ed8a72f0a70bef 100644
--- a/routing/kbucket/table.go
+++ b/routing/kbucket/table.go
@@ -8,7 +8,7 @@ import (
"time"
peer "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/peer"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("table")
diff --git a/routing/mock/centralized_client.go b/routing/mock/centralized_client.go
index 1a572e303ed6b8ae3124509403091563b0da3177..a15405a3fd44270277128a0a9f963589c0dfde41 100644
--- a/routing/mock/centralized_client.go
+++ b/routing/mock/centralized_client.go
@@ -14,7 +14,7 @@ import (
ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
peer "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/peer"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("mockrouter")
diff --git a/routing/none/none_client.go b/routing/none/none_client.go
index 172daf90ad6651ec52d24c12a46bf3ea4ba86c56..4ae1c2c89477fe0f794861c447ecefcc46944c07 100644
--- a/routing/none/none_client.go
+++ b/routing/none/none_client.go
@@ -9,7 +9,7 @@ import (
p2phost "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/host"
peer "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/peer"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("mockrouter")
diff --git a/routing/offline/offline.go b/routing/offline/offline.go
index 20f770d16173c8e8d9618e18484f4c9c97dbfa83..980cb1f9ad7dd5b1327ad52a7a409da6cea36976 100644
--- a/routing/offline/offline.go
+++ b/routing/offline/offline.go
@@ -13,7 +13,7 @@ import (
ci "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/crypto"
"gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/peer"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("offlinerouting")
diff --git a/routing/record/record.go b/routing/record/record.go
index 2d424b276e966853eeb566a2a3525796717c1c24..ca4a7b456497ec3d907f59b05676fd69fc0bc3da 100644
--- a/routing/record/record.go
+++ b/routing/record/record.go
@@ -8,7 +8,7 @@ import (
key "github.com/ipfs/go-ipfs/blocks/key"
pb "github.com/ipfs/go-ipfs/routing/dht/pb"
ci "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/crypto"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("routing/record")
diff --git a/routing/supernode/client.go b/routing/supernode/client.go
index 90f4744c5f3dbc2d2fae708a9d06a4fbc34fd7d2..72b9347f3310e48c1fecb451baad06404341e097 100644
--- a/routing/supernode/client.go
+++ b/routing/supernode/client.go
@@ -14,7 +14,7 @@ import (
proxy "github.com/ipfs/go-ipfs/routing/supernode/proxy"
"gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/host"
peer "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/peer"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("supernode")
diff --git a/routing/supernode/proxy/standard.go b/routing/supernode/proxy/standard.go
index 3b57ad625dd878d0c100779648ba85ead3bd685d..b08494c57697ce8a7812df9a983b5f1b3b5f6a5e 100644
--- a/routing/supernode/proxy/standard.go
+++ b/routing/supernode/proxy/standard.go
@@ -12,7 +12,7 @@ import (
host "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/host"
inet "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/net"
peer "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/peer"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
const ProtocolSNR = "/ipfs/supernoderouting"
diff --git a/tar/format.go b/tar/format.go
index f9fa2117c4fde0f09c01706f41f0b80443505237..26ddb3a8810f814c89993981d0ea19351039e38d 100644
--- a/tar/format.go
+++ b/tar/format.go
@@ -14,7 +14,7 @@ import (
dagutil "github.com/ipfs/go-ipfs/merkledag/utils"
path "github.com/ipfs/go-ipfs/path"
uio "github.com/ipfs/go-ipfs/unixfs/io"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
)
diff --git a/test/integration/addcat_test.go b/test/integration/addcat_test.go
index e173360deae9659898e15a5c9d4148b918119866..0071d83c4bd740a63265dcf0e9ba5beb80e3cf9b 100644
--- a/test/integration/addcat_test.go
+++ b/test/integration/addcat_test.go
@@ -20,7 +20,7 @@ import (
testutil "github.com/ipfs/go-ipfs/util/testutil"
mocknet "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/net/mock"
"gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/peer"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("epictest")
diff --git a/test/supernode_client/main.go b/test/supernode_client/main.go
index cc5c3ad55aee866cc12ffb8e8191c58a39d7559b..f82388924cfe6b18536cacbc315bbe8b3513d5ef 100644
--- a/test/supernode_client/main.go
+++ b/test/supernode_client/main.go
@@ -30,7 +30,7 @@ import (
unit "github.com/ipfs/go-ipfs/thirdparty/unit"
ds2 "github.com/ipfs/go-ipfs/util/datastore2"
peer "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/peer"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var elog = logging.Logger("gc-client")
diff --git a/thirdparty/pollEndpoint/main.go b/thirdparty/pollEndpoint/main.go
index a7fec5935f2c1bd4e599dde0b4314e5dd51ce61a..b3d12f1808335b1cd6e0a81b1322e22b292f6059 100644
--- a/thirdparty/pollEndpoint/main.go
+++ b/thirdparty/pollEndpoint/main.go
@@ -12,7 +12,7 @@ import (
ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var (
diff --git a/tour/tour.go b/tour/tour.go
index db8e7fa2299bf26897c89ad47d9a862114e15305..c6452e292b64a9acb7e067fe72ae8e71a0a6d82c 100644
--- a/tour/tour.go
+++ b/tour/tour.go
@@ -4,7 +4,7 @@ import (
"strconv"
"strings"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("tour")
diff --git a/unixfs/mod/dagmodifier.go b/unixfs/mod/dagmodifier.go
index a344ff398d0a1d7e7962e3824d437ddf1244f200..e9dbe40a01236168a755fdffa1a80e01214e1fb2 100644
--- a/unixfs/mod/dagmodifier.go
+++ b/unixfs/mod/dagmodifier.go
@@ -17,7 +17,7 @@ import (
mdag "github.com/ipfs/go-ipfs/merkledag"
ft "github.com/ipfs/go-ipfs/unixfs"
uio "github.com/ipfs/go-ipfs/unixfs/io"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var ErrSeekFail = errors.New("failed to seek properly")
diff --git a/util/eventlog/loggables/loggables.go b/util/eventlog/loggables/loggables.go
index 6e0937446972b90d0eea5dbf6422df047da21aca..202f4de871afe7f2dc2e87c4c603dd7651296e52 100644
--- a/util/eventlog/loggables/loggables.go
+++ b/util/eventlog/loggables/loggables.go
@@ -11,7 +11,7 @@ import (
ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
peer "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/peer"
)
diff --git a/util/ipfsaddr/ipfsaddr.go b/util/ipfsaddr/ipfsaddr.go
index 2dcb27326d4d7753f05f893edbf02517412e5601..b5e24685652404d31781c7690b5a43ed54c2fe0b 100644
--- a/util/ipfsaddr/ipfsaddr.go
+++ b/util/ipfsaddr/ipfsaddr.go
@@ -7,7 +7,7 @@ import (
path "github.com/ipfs/go-ipfs/path"
peer "gx/ipfs/QmZxtCsPRgCnCXwVPUjcBiFckkG5NMYM4Pthwe6X4C8uQq/go-libp2p/p2p/peer"
- logging "gx/ipfs/QmaPaGNE2GqnfJjRRpQuQuFHuJn4FZvsrGxdik4kgxCkBi/go-log"
+ logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
)
var log = logging.Logger("ipfsaddr")