| commit | 5c2a69917080999f77a02541a753078c7729232c | [log] [tgz] | 
|---|---|---|
| author | Nasser Grainawi <nasser@codeaurora.org> | Mon Dec 07 20:50:50 2020 -0700 | 
| committer | Nasser Grainawi <nasser@codeaurora.org> | Mon Dec 07 20:50:50 2020 -0700 | 
| tree | 239ab1dee65438d47ee86d97fe8f7d49f02cc533 | |
| parent | a6ca76650e4befab43f9fac288e6f27a38708dd1 [diff] | |
| parent | 5bd0d7e8e5704b11a95a0f2ca4c67eb392002484 [diff] | 
Merge branch 'stable-3.2' into stable-3.3 * stable-3.2: Fix replication to retry on lock errors Change-Id: Iab364714135d693e011e8abbf7782ae620d009c4