tree 239ab1dee65438d47ee86d97fe8f7d49f02cc533
parent a6ca76650e4befab43f9fac288e6f27a38708dd1
parent 5bd0d7e8e5704b11a95a0f2ca4c67eb392002484
author Nasser Grainawi <nasser@codeaurora.org> 1607399450 -0700
committer Nasser Grainawi <nasser@codeaurora.org> 1607399450 -0700

Merge branch 'stable-3.2' into stable-3.3

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

Change-Id: Iab364714135d693e011e8abbf7782ae620d009c4