Matthias Radestock f399c3a888 Merge branch '1.0' ...

Conflicts:
	ipam/ring/ring_test.go

2015-08-20 16:32:09 +01:00

..

paxos

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

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

ring

Merge branch '1.0'

2015-08-20 16:32:09 +01:00

space

Move ipam/address to net/address

2015-07-07 10:33:20 +00:00

allocate.go

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

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

allocator_test.go

Reduce the amount of parallelism in the ipam tests

2015-07-29 10:13:02 +00:00

allocator.go

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

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

claim.go

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

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

http_test.go

Move ipam/address to net/address

2015-07-07 10:33:20 +00:00

http.go

Rename 'reclaim' to 'noErrorUnknown' which describes the behaviour better

2015-07-23 20:16:30 +01:00

status.go

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

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

testutils_test.go

Add sender to mock broadcast messages

2015-07-15 13:05:25 +01:00