Merge pull request ipfs/kubo#3202 from ipfs/feat/floodsub

whyrusleeping · web-flow · commit 9ab1ff8ab828 · 2016-10-01T11:10:31.000-07:00
Add a very basic many to many pubsub This commit was moved from ipfs/kubo@e1c40df
diff --git a/gateway/core/corehttp/corehttp.go b/gateway/core/corehttp/corehttp.go
@@ -11,9 +11,9 @@ import (
 	"time"
 
 	core "github.com/ipfs/go-ipfs/core"
-	manet "gx/ipfs/QmPpRcbNUXauP3zWZ1NJMLWpe4QnmEHrd2ba2D3yqWznw7/go-multiaddr-net"
 	"gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
 	logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
+	manet "gx/ipfs/QmY83KqqnQ286ZWbV2x7ixpeemH3cBpk8R54egS619WYff/go-multiaddr-net"
 	ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@ import (`
`11`	`11`	`"time"`
`12`	`12`
`13`	`13`	`core "github.com/ipfs/go-ipfs/core"`
`14`		`- manet "gx/ipfs/QmPpRcbNUXauP3zWZ1NJMLWpe4QnmEHrd2ba2D3yqWznw7/go-multiaddr-net"`
`15`	`14`	`"gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"`
`16`	`15`	`logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"`
	`16`	`+ manet "gx/ipfs/QmY83KqqnQ286ZWbV2x7ixpeemH3cBpk8R54egS619WYff/go-multiaddr-net"`
`17`	`17`	`ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"`
`18`	`18`	`)`
`19`	`19`