This repository has been archived by the owner on Jun 20, 2024. It is now read-only.

resolve inconsistencies detected during ring merge#3637

Merged

bboreham merged 7 commits intomasterfrom issue-1962

Jun 14, 2019

+133-24

Commits on May 3, 2019

Commits on May 9, 2019

during merge we receive update to an entry that ring owns, and has a newer version, set our version to the one received plus one, effectively imposing our existing entry
murali-reddy
committed

Commits on May 10, 2019

move code to reset the entry free space from entries.merge() to Ring.Merge()
murali-reddy
committed

Commits on May 13, 2019

Commits on Jun 7, 2019

use space to check if entry in a range has allocations while doing ring merge
murali-reddy
committed