tree 36826c8d5fdb11ead49e60a906999804106d74b2
parent 6cfdeb49a0cbfe94f66b0d6c25c627bf5d6c98ec
parent a23367b33527cba1d7efdcdc77f1e4180eb6d6da
author Luca Milanesio <luca.milanesio@gmail.com> 1594850773 +0100
committer Luca Milanesio <luca.milanesio@gmail.com> 1594850773 +0100

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Fix naming for delay for draining the replication event queue

Change-Id: I1b3977e395bba314c7c87e7b26835659f4c222f3