tree 3799b38cc3630d0b9d2201a276ec84b2f683d228
parent ada8228a735d80a0a8652761621ca1d8c5ba986d
parent c4df2f1eb9fe470debf4958e05cf29c2ec314b43
author Nasser Grainawi <nasser@codeaurora.org> 1607398646 -0700
committer Nasser Grainawi <nasser@codeaurora.org> 1607398646 -0700

Merge branch 'stable-3.1' into stable-3.2

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

Change-Id: Icacd9095feaefd240803405c5b0a16cc0b3a9ed8