From 9b2c5b8466002329fc4c401428d31cb5e10f3b5e Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Fri, 17 Jul 2015 11:56:25 +0100
Subject: [PATCH] Improve description of merge error

---
 ipam/ring/ring.go      | 22 +++++++++++-----------
 ipam/ring/ring_test.go |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ipam/ring/ring.go b/ipam/ring/ring.go
index 4adea6ae..9faf016a 100644
--- a/ipam/ring/ring.go
+++ b/ipam/ring/ring.go
@@ -33,16 +33,16 @@ func (r *Ring) assertInvariants() {
 
 // Errors returned by Merge
 var (
-	ErrNotSorted        = errors.New("Ring not sorted")
-	ErrTokenRepeated    = errors.New("Token appears twice in ring")
-	ErrTokenOutOfRange  = errors.New("Token is out of range")
-	ErrDifferentSubnets = errors.New("IP Allocator with different subnet detected")
-	ErrNewerVersion     = errors.New("Received new version for entry I own!")
-	ErrInvalidEntry     = errors.New("Received invalid state update!")
-	ErrEntryInMyRange   = errors.New("Received new entry in my range!")
-	ErrNoFreeSpace      = errors.New("No free space found!")
-	ErrInvalidTimeout   = errors.New("dt must be greater than 0")
-	ErrNotFound         = errors.New("No entries for peer found")
+	ErrNotSorted       = errors.New("Ring not sorted")
+	ErrTokenRepeated   = errors.New("Token appears twice in ring")
+	ErrTokenOutOfRange = errors.New("Token is out of range")
+	ErrDifferentRange  = errors.New("Received range differs from ours!")
+	ErrNewerVersion    = errors.New("Received new version for entry I own!")
+	ErrInvalidEntry    = errors.New("Received invalid state update!")
+	ErrEntryInMyRange  = errors.New("Received new entry in my range!")
+	ErrNoFreeSpace     = errors.New("No free space found!")
+	ErrInvalidTimeout  = errors.New("dt must be greater than 0")
+	ErrNotFound        = errors.New("No entries for peer found")
 )
 
 func (r *Ring) checkInvariants() error {
@@ -191,7 +191,7 @@ func (r *Ring) Merge(gossip Ring) error {
 	}
 
 	if r.Start != gossip.Start || r.End != gossip.End {
-		return ErrDifferentSubnets
+		return ErrDifferentRange
 	}
 
 	// Now merge their ring with yours, in a temporary ring.
diff --git a/ipam/ring/ring_test.go b/ipam/ring/ring_test.go
index e29c3a5e..c9ab789b 100644
--- a/ipam/ring/ring_test.go
+++ b/ipam/ring/ring_test.go
@@ -212,7 +212,7 @@ func TestMergeErrors(t *testing.T) {
 	// Should Merge two rings for different ranges
 	ring2 = New(start, middle, peer2name)
 	ring2.Entries = []*entry{}
-	require.True(t, ring1.Merge(*ring2) == ErrDifferentSubnets, "Expected ErrDifferentSubnets")
+	require.True(t, ring1.Merge(*ring2) == ErrDifferentRange, "Expected ErrDifferentRange")
 
 	// Cannot Merge newer version of entry I own
 	ring2 = New(start, end, peer2name)