Matthias Radestock 3d3b7a5672 Merge branch '1.1' ...

Conflicts:
	router/ethernet_decoder.go
	router/local_peer.go

2015-10-05 20:02:32 +01:00

..

bridge.go

Injected packets shouldn't happen in handleCapturedPacket

2015-09-08 10:46:04 +01:00

connection_maker.go

refactor: better 'try' method names

2015-10-02 11:31:11 +01:00

connection.go

Merge pull request #1483 from weaveworks/1478-cm-termination-race

2015-10-01 12:01:55 +01:00

consts.go

Introduce Overlay / sleeve

2015-09-08 10:44:44 +01:00

crypto.go

Removed all the imports from "code.google.com"

2015-07-29 15:47:02 +01:00

ethernet_decoder.go

Merge branch '1.1'

2015-10-05 20:02:32 +01:00

flow.go

Flows

2015-09-08 10:44:52 +01:00

gossip_channel.go

Sanity-check gossip messages

2015-09-30 14:39:27 +01:00

gossip_test.go

Add NewPeerFromSummary

2015-09-08 10:46:02 +01:00

gossip.go

Add sender to OnGossipBroadcast()

2015-07-15 12:07:56 +01:00

http.go

new weave status, weave status ..., and weave report

2015-08-11 12:15:13 +01:00

local_peer.go

unswap src and dst ip in "too big DF broadcast" warning

2015-10-05 19:56:59 +01:00

mac_cache.go

Injected packets shouldn't happen in handleCapturedPacket

2015-09-08 10:46:04 +01:00

mocks_test.go

Add NewPeerFromSummary

2015-09-08 10:46:02 +01:00

overlay.go

Restore sleeve compatibility with 1.1

2015-09-21 08:33:11 +01:00

pcap.go

Flows

2015-09-08 10:44:52 +01:00

peer_name_hash.go

cosmetic: resolve some linter complaints

2015-05-11 02:33:56 +01:00

peer_name_mac.go

cosmetic: resolve some linter complaints

2015-05-11 02:33:56 +01:00

peer.go

Add NewPeerFromSummary

2015-09-08 10:46:02 +01:00

peers_test.go

refactor: simplify NewPeers

2015-07-11 17:46:57 +01:00

peers.go

Add NewPeerFromSummary

2015-09-08 10:46:02 +01:00

protocol_test.go

Add a --protocol-min-version option to router

2015-07-09 14:38:06 +01:00

protocol.go

Restore sleeve compatibility with 1.1

2015-09-21 08:33:11 +01:00

router.go

Injected packets shouldn't happen in handleCapturedPacket

2015-09-08 10:46:04 +01:00

routes.go

Notify the Overlay when routes change

2015-09-08 10:44:57 +01:00

sleeve.go

Merge branch '1.1'

2015-10-05 20:02:32 +01:00

status.go

refactor: simplify target status reporting

2015-10-01 20:05:12 +01:00

surrogate_gossiper.go

Add sender to OnGossipBroadcast()

2015-07-15 12:07:56 +01:00

token_bucket.go

Add token bucket implementation

2015-07-13 15:01:04 +01:00

utils.go

Merge weaveworks/go-1.5 (PR #1386)

2015-09-09 12:23:57 +01:00