tree 4becf2f6e34d3a8c607837e61fefec5d1bb1812f
parent 4604b01e43c3b4aee3d03cb84945b3238c150ede
parent ba2c8e16b798c2eaf4e56dd66d8c1cd00999e096
author Nasser Grainawi <nasser@codeaurora.org> 1607396670 -0700
committer Nasser Grainawi <nasser@codeaurora.org> 1607396670 -0700

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Fix replication to retry on lock errors

Change-Id: I6e262d2c22d2dcd49b341b3c752d6d8b6c93b32c