Matthias Radestock f399c3a888 Merge branch '1.0' ...

Conflicts:
	ipam/ring/ring_test.go

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

..

entry.go

remove dead code

2015-07-11 11:17:44 +01:00

expvar.go

Ring CRDT for IP Allocation Management

2015-05-14 17:33:20 +01:00

ring_test.go

Merge branch '1.0'

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

ring.go

Remove unused error messages

2015-07-17 12:19:54 +01:00