tree 8fca3f5da9bfc8a82c14dd8e9bfd4e2f02dd65e5
parent fda228c18de9def19fbd50c2d01ebbb42e7c73cc
parent 1812e0d2ce7e261d90e7c0b726376a6938680786
author Luca Milanesio <luca.milanesio@gmail.com> 1593639983 +0100
committer Luca Milanesio <luca.milanesio@gmail.com> 1593639983 +0100

Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: I58ce5a03d7b1094ef859c4cd2bd08a3ead00ba30