tree b5a7195f853aad1703f07ad77017c26893efbcc0
parent 1812e0d2ce7e261d90e7c0b726376a6938680786
parent 9f679b030aedcb5cdae6810798f2602b62f58fa0
author Luca Milanesio <luca.milanesio@gmail.com> 1594846143 +0100
committer Luca Milanesio <luca.milanesio@gmail.com> 1594846143 +0100

Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I3cba1756a10a1c12db96d04ca55d3feb7bc8784e