tree 7754d0d2faad913af14596625eac0bc9fcc61e93
parent d85571979b342670e2d07a23d88b2315a911e49b
parent 58778e145d83dfa05035626aca62d968f11b7e3d
author Luca Milanesio <luca.milanesio@gmail.com> 1593637340 +0100
committer Luca Milanesio <luca.milanesio@gmail.com> 1593637352 +0100

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Improve readability of shouldFirePendingOnlyToStoredUri test
  Fix flakiness in ReplicationIT for pending events firing

Change-Id: Id40baca92acc9fba8656630f725d55e5fbb6662b