This is an automated email from the ASF dual-hosted git repository.
junchao pushed a change to branch smart_contract_merge
in repository https://gitbox.apache.org/repos/asf/incubator-resilientdb.git
from 0beac2a9 merge master
add 1dd7a5e1 merge master
No new revisions were added by this update.
Summary of changes:
platform/consensus/ordering/{poe/proto => common}/algorithm/BUILD | 0
.../ordering/{poe/proto => common}/algorithm/protocol_base.cpp | 0
.../ordering/{poe/proto => common}/algorithm/protocol_base.h | 0
platform/consensus/ordering/{poe/proto => common}/framework/BUILD | 0
.../ordering/{poe/proto => common}/framework/consensus.cpp | 0
.../consensus/ordering/{poe/proto => common}/framework/consensus.h | 0
.../{poe/proto => common}/framework/performance_manager.cpp | 0
.../ordering/{poe/proto => common}/framework/performance_manager.h | 0
.../ordering/{poe/proto => common}/framework/response_manager.cpp | 0
.../ordering/{poe/proto => common}/framework/response_manager.h | 0
.../ordering/{poe/proto => common}/framework/transaction_utils.cpp | 0
.../ordering/{poe/proto => common}/framework/transaction_utils.h | 0
platform/consensus/ordering/{pbft => common}/transaction_utils.cpp | 2 +-
platform/consensus/ordering/{pbft => common}/transaction_utils.h | 7 +------
14 files changed, 2 insertions(+), 7 deletions(-)
copy platform/consensus/ordering/{poe/proto => common}/algorithm/BUILD (100%)
copy platform/consensus/ordering/{poe/proto =>
common}/algorithm/protocol_base.cpp (100%)
copy platform/consensus/ordering/{poe/proto =>
common}/algorithm/protocol_base.h (100%)
copy platform/consensus/ordering/{poe/proto => common}/framework/BUILD (100%)
copy platform/consensus/ordering/{poe/proto => common}/framework/consensus.cpp
(100%)
copy platform/consensus/ordering/{poe/proto => common}/framework/consensus.h
(100%)
copy platform/consensus/ordering/{poe/proto =>
common}/framework/performance_manager.cpp (100%)
copy platform/consensus/ordering/{poe/proto =>
common}/framework/performance_manager.h (100%)
copy platform/consensus/ordering/{poe/proto =>
common}/framework/response_manager.cpp (100%)
copy platform/consensus/ordering/{poe/proto =>
common}/framework/response_manager.h (100%)
copy platform/consensus/ordering/{poe/proto =>
common}/framework/transaction_utils.cpp (100%)
copy platform/consensus/ordering/{poe/proto =>
common}/framework/transaction_utils.h (100%)
copy platform/consensus/ordering/{pbft => common}/transaction_utils.cpp (95%)
copy platform/consensus/ordering/{pbft => common}/transaction_utils.h (94%)
