Update import location for mesh

This commit is contained in:
Peter Bourgon committed 2016-01-15 15:57:01 +01:00
1 parent 90afa7db93
commit e27b320ede
24 files changed
+34 -25

No files matched your search

+2 -1
View File
@@ -7,11 +7,12 @@ import (
"sort" "sort"
"time" "time"
"github.com/weaveworks/mesh"
"github.com/weaveworks/weave/common" "github.com/weaveworks/weave/common"
"github.com/weaveworks/weave/ipam/paxos" "github.com/weaveworks/weave/ipam/paxos"
"github.com/weaveworks/weave/ipam/ring" "github.com/weaveworks/weave/ipam/ring"
"github.com/weaveworks/weave/ipam/space" "github.com/weaveworks/weave/ipam/space"
"github.com/weaveworks/weave/mesh"
"github.com/weaveworks/weave/net/address" "github.com/weaveworks/weave/net/address"
) )
+2 -1
View File
@@ -3,8 +3,9 @@ package ipam
import ( import (
"fmt" "fmt"
"github.com/weaveworks/mesh"
"github.com/weaveworks/weave/common" "github.com/weaveworks/weave/common"
"github.com/weaveworks/weave/mesh"
"github.com/weaveworks/weave/net/address" "github.com/weaveworks/weave/net/address"
) )
+1 -1
View File
@@ -1,7 +1,7 @@
package paxos package paxos
import ( import (
"github.com/weaveworks/weave/mesh" "github.com/weaveworks/mesh"
) )
// The node identifier. The use of the UID here is important: Paxos // The node identifier. The use of the UID here is important: Paxos
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/weaveworks/weave/mesh" "github.com/weaveworks/mesh"
) )
type TestNode struct { type TestNode struct {
+2 -1
View File
@@ -3,8 +3,9 @@ package ring
import ( import (
"sort" "sort"
"github.com/weaveworks/mesh"
"github.com/weaveworks/weave/common" "github.com/weaveworks/weave/common"
"github.com/weaveworks/weave/mesh"
"github.com/weaveworks/weave/net/address" "github.com/weaveworks/weave/net/address"
) )
+2 -1
View File
@@ -12,8 +12,9 @@ import (
"sort" "sort"
"time" "time"
"github.com/weaveworks/mesh"
"github.com/weaveworks/weave/common" "github.com/weaveworks/weave/common"
"github.com/weaveworks/weave/mesh"
"github.com/weaveworks/weave/net/address" "github.com/weaveworks/weave/net/address"
) )
+2 -1
View File
@@ -8,8 +8,9 @@ import (
"testing" "testing"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/weaveworks/mesh"
"github.com/weaveworks/weave/common" "github.com/weaveworks/weave/common"
"github.com/weaveworks/weave/mesh"
"github.com/weaveworks/weave/net/address" "github.com/weaveworks/weave/net/address"
) )
+2 -1
View File
@@ -7,8 +7,9 @@ import (
"testing" "testing"
"time" "time"
"github.com/weaveworks/mesh"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/weaveworks/weave/mesh"
"github.com/weaveworks/weave/net/address" "github.com/weaveworks/weave/net/address"
"github.com/weaveworks/weave/testing/gossip" "github.com/weaveworks/weave/testing/gossip"
) )
+1 -1
View File
@@ -11,7 +11,7 @@ import (
"github.com/miekg/dns" "github.com/miekg/dns"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/weaveworks/weave/mesh" "github.com/weaveworks/mesh"
"github.com/weaveworks/weave/net/address" "github.com/weaveworks/weave/net/address"
) )
+2 -1
View File
@@ -8,7 +8,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/weaveworks/weave/mesh" "github.com/weaveworks/mesh"
"github.com/weaveworks/weave/net/address" "github.com/weaveworks/weave/net/address"
) )
+1 -1
View File
@@ -4,8 +4,8 @@ import (
"testing" "testing"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/weaveworks/mesh"
"github.com/weaveworks/weave/mesh"
"github.com/weaveworks/weave/net/address" "github.com/weaveworks/weave/net/address"
) )
+1 -1
View File
@@ -6,9 +6,9 @@ import (
"time" "time"
"github.com/miekg/dns" "github.com/miekg/dns"
"github.com/weaveworks/mesh"
. "github.com/weaveworks/weave/common" . "github.com/weaveworks/weave/common"
"github.com/weaveworks/weave/mesh"
"github.com/weaveworks/weave/net/address" "github.com/weaveworks/weave/net/address"
) )
+1 -1
View File
@@ -10,8 +10,8 @@ import (
"time" "time"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/weaveworks/mesh"
"github.com/weaveworks/weave/mesh"
"github.com/weaveworks/weave/net/address" "github.com/weaveworks/weave/net/address"
"github.com/weaveworks/weave/testing/gossip" "github.com/weaveworks/weave/testing/gossip"
) )
+2 -1
View File
@@ -9,9 +9,10 @@ import (
"text/template" "text/template"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/weaveworks/mesh"
. "github.com/weaveworks/weave/common" . "github.com/weaveworks/weave/common"
"github.com/weaveworks/weave/ipam" "github.com/weaveworks/weave/ipam"
"github.com/weaveworks/weave/mesh"
"github.com/weaveworks/weave/nameserver" "github.com/weaveworks/weave/nameserver"
"github.com/weaveworks/weave/net/address" "github.com/weaveworks/weave/net/address"
weave "github.com/weaveworks/weave/router" weave "github.com/weaveworks/weave/router"
+1 -1
View File
@@ -13,11 +13,11 @@ import (
"github.com/davecheney/profile" "github.com/davecheney/profile"
"github.com/docker/docker/pkg/mflag" "github.com/docker/docker/pkg/mflag"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/weaveworks/mesh"
. "github.com/weaveworks/weave/common" . "github.com/weaveworks/weave/common"
"github.com/weaveworks/weave/common/docker" "github.com/weaveworks/weave/common/docker"
"github.com/weaveworks/weave/ipam" "github.com/weaveworks/weave/ipam"
"github.com/weaveworks/weave/mesh"
"github.com/weaveworks/weave/nameserver" "github.com/weaveworks/weave/nameserver"
weavenet "github.com/weaveworks/weave/net" weavenet "github.com/weaveworks/weave/net"
"github.com/weaveworks/weave/net/address" "github.com/weaveworks/weave/net/address"
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"time" "time"
"github.com/weaveworks/go-odp/odp" "github.com/weaveworks/go-odp/odp"
"github.com/weaveworks/weave/mesh" "github.com/weaveworks/mesh"
) )
// The virtual bridge accepts packets from ODP vports and the router // The virtual bridge accepts packets from ODP vports and the router
+1 -1
View File
@@ -3,7 +3,7 @@ package router
import ( import (
"net" "net"
"github.com/weaveworks/weave/mesh" "github.com/weaveworks/mesh"
) )
// Just enough flow machinery for the weave router // Just enough flow machinery for the weave router
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/weaveworks/weave/mesh" "github.com/weaveworks/mesh"
) )
type MacCacheEntry struct { type MacCacheEntry struct {
+1 -1
View File
@@ -1,7 +1,7 @@
package router package router
import ( import (
"github.com/weaveworks/weave/mesh" "github.com/weaveworks/mesh"
) )
// Interface to overlay network packet handling // Interface to overlay network packet handling
+2 -1
View File
@@ -5,8 +5,9 @@ import (
"net" "net"
"time" "time"
"github.com/weaveworks/mesh"
"github.com/weaveworks/weave/common" "github.com/weaveworks/weave/common"
"github.com/weaveworks/weave/mesh"
) )
const ( const (
+1 -1
View File
@@ -3,7 +3,7 @@ package router
import ( import (
"time" "time"
"github.com/weaveworks/weave/mesh" "github.com/weaveworks/mesh"
) )
type NetworkRouterStatus struct { type NetworkRouterStatus struct {
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/weaveworks/weave/mesh" "github.com/weaveworks/mesh"
) )
// OverlaySwitch selects which overlay to use, from a set of // OverlaySwitch selects which overlay to use, from a set of
+1 -2
View File
@@ -18,8 +18,7 @@ import (
"github.com/google/gopacket" "github.com/google/gopacket"
"github.com/google/gopacket/layers" "github.com/google/gopacket/layers"
"github.com/weaveworks/mesh"
"github.com/weaveworks/weave/mesh"
) )
// This diagram explains the various arithmetic and variables related // This diagram explains the various arithmetic and variables related
+2 -1
View File
@@ -6,8 +6,9 @@ import (
"math/rand" "math/rand"
"time" "time"
"github.com/weaveworks/mesh"
"github.com/weaveworks/weave/common" "github.com/weaveworks/weave/common"
"github.com/weaveworks/weave/mesh"
) )
// Router to convey gossip from one gossiper to another, for testing // Router to convey gossip from one gossiper to another, for testing