This commit is contained in:
Murali Reddy committed 2019-05-03 10:55:13 +05:30
1 parent a400d43df7
commit 11c55a3a07
1 file changed
+1 -1
+1 -1
View File
@@ -231,7 +231,7 @@ func TestMergeWithConflicts(t *testing.T) {
require.NoError(t, merge(ring1, ring2))
// received update to entry with a token and version identical to an entry we have
// but but holding different content, if there are allocations, then reject the recieved
// but but holding different content, if there are allocations, then reject the received
// entry
ring1 = NewRing(start, end, peer1name)
ring2 = NewRing(start, end, peer2name)