Naveen Setlur

bors r=dt

bors r=dt

@msbutler The test cases are up to date, but I don't explain who wins the conflict. Do you want me to elaborate on that?

bors r=msbutler

TFTR bors r=msbutler

Added 2 followups: https://cockroachlabs.atlassian.net/browse/CRDB-39982 https://cockroachlabs.atlassian.net/browse/CRDB-39983

> NB: i would not merge this until the test you added passed extended CI (at least under the stress build. ) https://teamcity.cockroachdb.com/viewLog.html?buildId=15929931&buildTypeId=Cockroach_BazelExtendedCi Thanks Michael, will make sure to double...

bors r=stevendanna