Adam Harrison d5a4326b9e Merge branch '1.0' ...

Conflicts:
	ipam/allocator_test.go
	ipam/claim.go

2015-07-10 14:35:41 +01:00

..

paxos

cosmetic: goimports -w .

2015-07-03 20:41:35 +01:00

ring

Move ipam/address to net/address

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

space

Move ipam/address to net/address

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

allocate.go

Move ipam/address to net/address

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

allocator_test.go

Don't cancel address claim when caller closes socket

2015-07-09 10:47:34 +01:00

allocator.go

Merge branch '1.0'

2015-07-10 14:35:41 +01:00

claim.go

Merge branch '1.0'

2015-07-10 14:35:41 +01:00

http_test.go

Move ipam/address to net/address

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

http.go

Merge branch '1.0'

2015-07-10 14:35:41 +01:00

testutils_test.go

Move test gossip router out of ipam code for use in gossip dns code.

2015-07-08 15:03:13 +00:00