Matthias Radestock ee2a66323e Merge branch '1.0' ...

Conflicts:
	ipam/ring/ring_test.go

2015-06-25 19:57:09 +01:00

..

entry.go

Ring CRDT for IP Allocation Management

2015-05-14 17:33:20 +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-06-25 19:57:09 +01:00

ring.go

Updated after review feedback

2015-06-25 15:41:06 +01:00