diff --git a/ipam/allocator.go b/ipam/allocator.go index ae0565c3..eeec049c 100644 --- a/ipam/allocator.go +++ b/ipam/allocator.go @@ -7,11 +7,12 @@ import ( "sort" "time" + "github.com/weaveworks/mesh" + "github.com/weaveworks/weave/common" "github.com/weaveworks/weave/ipam/paxos" "github.com/weaveworks/weave/ipam/ring" "github.com/weaveworks/weave/ipam/space" - "github.com/weaveworks/weave/mesh" "github.com/weaveworks/weave/net/address" ) diff --git a/ipam/claim.go b/ipam/claim.go index 0173af6a..216c2dd2 100644 --- a/ipam/claim.go +++ b/ipam/claim.go @@ -3,8 +3,9 @@ package ipam import ( "fmt" + "github.com/weaveworks/mesh" + "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/mesh" "github.com/weaveworks/weave/net/address" ) diff --git a/ipam/paxos/paxos.go b/ipam/paxos/paxos.go index 3466bb8c..9b5ab3d1 100644 --- a/ipam/paxos/paxos.go +++ b/ipam/paxos/paxos.go @@ -1,7 +1,7 @@ package paxos import ( - "github.com/weaveworks/weave/mesh" + "github.com/weaveworks/mesh" ) // The node identifier. The use of the UID here is important: Paxos diff --git a/ipam/paxos/paxos_test.go b/ipam/paxos/paxos_test.go index c9dd1ff9..a827cf71 100644 --- a/ipam/paxos/paxos_test.go +++ b/ipam/paxos/paxos_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/weaveworks/weave/mesh" + "github.com/weaveworks/mesh" ) type TestNode struct { diff --git a/ipam/ring/entry.go b/ipam/ring/entry.go index 872a13ab..d7ca53e5 100644 --- a/ipam/ring/entry.go +++ b/ipam/ring/entry.go @@ -3,8 +3,9 @@ package ring import ( "sort" + "github.com/weaveworks/mesh" + "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/mesh" "github.com/weaveworks/weave/net/address" ) diff --git a/ipam/ring/ring.go b/ipam/ring/ring.go index 2e384eca..adc9e87b 100644 --- a/ipam/ring/ring.go +++ b/ipam/ring/ring.go @@ -12,8 +12,9 @@ import ( "sort" "time" + "github.com/weaveworks/mesh" + "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/mesh" "github.com/weaveworks/weave/net/address" ) diff --git a/ipam/ring/ring_test.go b/ipam/ring/ring_test.go index 10062d3b..b36a0333 100644 --- a/ipam/ring/ring_test.go +++ b/ipam/ring/ring_test.go @@ -8,8 +8,9 @@ import ( "testing" "github.com/stretchr/testify/require" + "github.com/weaveworks/mesh" + "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/mesh" "github.com/weaveworks/weave/net/address" ) diff --git a/ipam/testutils_test.go b/ipam/testutils_test.go index 3aac1cce..60392403 100644 --- a/ipam/testutils_test.go +++ b/ipam/testutils_test.go @@ -7,8 +7,9 @@ import ( "testing" "time" + "github.com/weaveworks/mesh" + "github.com/stretchr/testify/require" - "github.com/weaveworks/weave/mesh" "github.com/weaveworks/weave/net/address" "github.com/weaveworks/weave/testing/gossip" ) diff --git a/nameserver/dns_test.go b/nameserver/dns_test.go index 9712fe91..9adc4333 100644 --- a/nameserver/dns_test.go +++ b/nameserver/dns_test.go @@ -11,7 +11,7 @@ import ( "github.com/miekg/dns" "github.com/stretchr/testify/require" - "github.com/weaveworks/weave/mesh" + "github.com/weaveworks/mesh" "github.com/weaveworks/weave/net/address" ) diff --git a/nameserver/entry.go b/nameserver/entry.go index cb0830fa..6d82315a 100644 --- a/nameserver/entry.go +++ b/nameserver/entry.go @@ -8,7 +8,8 @@ import ( "strings" "time" - "github.com/weaveworks/weave/mesh" + "github.com/weaveworks/mesh" + "github.com/weaveworks/weave/net/address" ) diff --git a/nameserver/entry_test.go b/nameserver/entry_test.go index 57dfde02..e6cbdf8d 100644 --- a/nameserver/entry_test.go +++ b/nameserver/entry_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" + "github.com/weaveworks/mesh" - "github.com/weaveworks/weave/mesh" "github.com/weaveworks/weave/net/address" ) diff --git a/nameserver/nameserver.go b/nameserver/nameserver.go index ef303728..4febe154 100644 --- a/nameserver/nameserver.go +++ b/nameserver/nameserver.go @@ -6,9 +6,9 @@ import ( "time" "github.com/miekg/dns" + "github.com/weaveworks/mesh" . "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/mesh" "github.com/weaveworks/weave/net/address" ) diff --git a/nameserver/nameserver_test.go b/nameserver/nameserver_test.go index f30e53a4..c283cff7 100644 --- a/nameserver/nameserver_test.go +++ b/nameserver/nameserver_test.go @@ -10,8 +10,8 @@ import ( "time" "github.com/stretchr/testify/require" + "github.com/weaveworks/mesh" - "github.com/weaveworks/weave/mesh" "github.com/weaveworks/weave/net/address" "github.com/weaveworks/weave/testing/gossip" ) diff --git a/prog/weaver/http.go b/prog/weaver/http.go index c02b2bdb..4ae0e251 100644 --- a/prog/weaver/http.go +++ b/prog/weaver/http.go @@ -9,9 +9,10 @@ import ( "text/template" "github.com/gorilla/mux" + "github.com/weaveworks/mesh" + . "github.com/weaveworks/weave/common" "github.com/weaveworks/weave/ipam" - "github.com/weaveworks/weave/mesh" "github.com/weaveworks/weave/nameserver" "github.com/weaveworks/weave/net/address" weave "github.com/weaveworks/weave/router" diff --git a/prog/weaver/main.go b/prog/weaver/main.go index 0b2b033b..0ff8ffd9 100644 --- a/prog/weaver/main.go +++ b/prog/weaver/main.go @@ -13,11 +13,11 @@ import ( "github.com/davecheney/profile" "github.com/docker/docker/pkg/mflag" "github.com/gorilla/mux" + "github.com/weaveworks/mesh" . "github.com/weaveworks/weave/common" "github.com/weaveworks/weave/common/docker" "github.com/weaveworks/weave/ipam" - "github.com/weaveworks/weave/mesh" "github.com/weaveworks/weave/nameserver" weavenet "github.com/weaveworks/weave/net" "github.com/weaveworks/weave/net/address" diff --git a/router/fastdp.go b/router/fastdp.go index ad294bfd..3b3fbb06 100644 --- a/router/fastdp.go +++ b/router/fastdp.go @@ -10,7 +10,7 @@ import ( "time" "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 diff --git a/router/flow.go b/router/flow.go index e523a255..34a1a7f7 100644 --- a/router/flow.go +++ b/router/flow.go @@ -3,7 +3,7 @@ package router import ( "net" - "github.com/weaveworks/weave/mesh" + "github.com/weaveworks/mesh" ) // Just enough flow machinery for the weave router diff --git a/router/mac_cache.go b/router/mac_cache.go index 0d95d623..31510c6e 100644 --- a/router/mac_cache.go +++ b/router/mac_cache.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/weaveworks/weave/mesh" + "github.com/weaveworks/mesh" ) type MacCacheEntry struct { diff --git a/router/network_overlay.go b/router/network_overlay.go index b09b720b..7ed00e42 100644 --- a/router/network_overlay.go +++ b/router/network_overlay.go @@ -1,7 +1,7 @@ package router import ( - "github.com/weaveworks/weave/mesh" + "github.com/weaveworks/mesh" ) // Interface to overlay network packet handling diff --git a/router/network_router.go b/router/network_router.go index eb6b81c6..f936cc04 100644 --- a/router/network_router.go +++ b/router/network_router.go @@ -5,8 +5,9 @@ import ( "net" "time" + "github.com/weaveworks/mesh" + "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/mesh" ) const ( diff --git a/router/network_router_status.go b/router/network_router_status.go index e35267e9..5b34e87b 100644 --- a/router/network_router_status.go +++ b/router/network_router_status.go @@ -3,7 +3,7 @@ package router import ( "time" - "github.com/weaveworks/weave/mesh" + "github.com/weaveworks/mesh" ) type NetworkRouterStatus struct { diff --git a/router/overlay_switch.go b/router/overlay_switch.go index da4bab78..553b9fdc 100644 --- a/router/overlay_switch.go +++ b/router/overlay_switch.go @@ -5,7 +5,7 @@ import ( "strings" "sync" - "github.com/weaveworks/weave/mesh" + "github.com/weaveworks/mesh" ) // OverlaySwitch selects which overlay to use, from a set of diff --git a/router/sleeve.go b/router/sleeve.go index 110d4bac..7f5b2b88 100644 --- a/router/sleeve.go +++ b/router/sleeve.go @@ -18,8 +18,7 @@ import ( "github.com/google/gopacket" "github.com/google/gopacket/layers" - - "github.com/weaveworks/weave/mesh" + "github.com/weaveworks/mesh" ) // This diagram explains the various arithmetic and variables related diff --git a/testing/gossip/mocks.go b/testing/gossip/mocks.go index 1a42b03d..c3084adc 100644 --- a/testing/gossip/mocks.go +++ b/testing/gossip/mocks.go @@ -6,8 +6,9 @@ import ( "math/rand" "time" + "github.com/weaveworks/mesh" + "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/mesh" ) // Router to convey gossip from one gossiper to another, for testing