swarm: network rewrite merge

2018-06-20 14:06:27 +02:00
parent 574378edb5
commit e187711c65
201 changed files with 39605 additions and 9921 deletions
--- a/swarm/api/http/roundtripper.go
+++ b/swarm/api/http/roundtripper.go
@ -20,7 +20,7 @@ import (
 	"fmt"
 	"net/http"

-	"github.com/ethereum/go-ethereum/log"
+	"github.com/ethereum/go-ethereum/swarm/log"
 )

 /*