This is an automated email from the ASF dual-hosted git repository. ritik pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 24980971454309ac2152f59a7b57112a18cc7da4 Merge: aceeb50e5c c8b0f90c72 Author: Michael Blow <[email protected]> AuthorDate: Tue Nov 5 21:07:25 2024 -0500 Merge branch 'gerrit/trinity' into 'gerrit/morpheus' Change-Id: I33ab3b1553d3d7b93a24a318f65c555a30195923 .../asterix/app/active/ActiveEntityEventsListener.java | 6 ++++++ .../org/apache/asterix/app/active/RecoveryTask.java | 18 ++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-)
