moved net/swarm2 -> swarm

2ae9b278 · Juan Batiz-Benet · 5d019ad3 · 2ae9b278 · 2ae9b278 · 2ae9b278
Commit 2ae9b278 authored Dec 17, 2014 by Juan Batiz-Benet
9 changed files
--- a/net/net.go
+++ b/net/net.go
@@ -2,7 +2,7 @@
 package net

 import (
-	swarm "github.com/jbenet/go-ipfs/net/swarm2"
+	swarm "github.com/jbenet/go-ipfs/net/swarm"
 	peer "github.com/jbenet/go-ipfs/peer"

 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"

--- a/net/swarm2/addr.go
+++ b/net/swarm2/addr.go
--- a/net/swarm2/simul_test.go
+++ b/net/swarm2/simul_test.go
--- a/net/swarm2/swarm.go
+++ b/net/swarm2/swarm.go
--- a/net/swarm2/swarm_conn.go
+++ b/net/swarm2/swarm_conn.go
--- a/net/swarm2/swarm_dial.go
+++ b/net/swarm2/swarm_dial.go
--- a/net/swarm2/swarm_listen.go
+++ b/net/swarm2/swarm_listen.go
--- a/net/swarm2/swarm_stream.go
+++ b/net/swarm2/swarm_stream.go
--- a/net/swarm2/swarm_test.go
+++ b/net/swarm2/swarm_test.go