tree eaa5d292bcad59b837039b8555d24d8871de713e
parent e09b5a08e183d4f92410bfa06289a1784cefb43b
parent 2a600dede934b348173bff26e00f373367a3d142
author Nasser Grainawi <nasser@codeaurora.org> 1607397910 -0700
committer Nasser Grainawi <nasser@codeaurora.org> 1607397910 -0700

Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: Ib4b2c1fcac5da6551f72bce68a101b93e9b43b19