This is an automated email from the ASF dual-hosted git repository.

harishgokul01 pushed a commit to branch development
in repository https://gitbox.apache.org/repos/asf/incubator-resilientdb.git

commit 42073895ce075ce034c073a20e25e4f09ecd59ce
Merge: 6e022310 dfdc9b62
Author: harish876 <[email protected]>
AuthorDate: Mon Jan 26 06:52:28 2026 +0000

    Merge branch 'master' of https://github.com/apache/incubator-resilientdb 
into development

 .../common/framework/performance_manager.cpp       |  6 +++-
 .../common/framework/performance_manager.h         |  1 +
 .../ordering/pbft/checkpoint_manager_test.cpp      | 12 ++++---
 .../consensus/ordering/pbft/commitment_test.cpp    |  3 +-
 platform/consensus/ordering/pbft/query_test.cpp    |  3 +-
 platform/consensus/ordering/poe/framework/BUILD    | 11 ++++++
 .../consensus/ordering/poe/framework/consensus.cpp | 14 ++++++++
 .../consensus/ordering/poe/framework/consensus.h   |  3 ++
 .../{consensus.h => performance_manager.cpp}       | 40 ++++++++--------------
 .../{consensus.h => performance_manager.h}         | 32 ++++++-----------
 10 files changed, 71 insertions(+), 54 deletions(-)

Reply via email to