Merge "Rewrite HashRing to use consistent hashing"