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

mikexue pushed a commit to branch eventmesh-function
in repository https://gitbox.apache.org/repos/asf/eventmesh.git

commit e4fe83e0847c0fb1ba6dbfd894d0508294ee4a67
Merge: 616379264 a461e21b3
Author: xwm1992 <[email protected]>
AuthorDate: Thu May 30 11:11:04 2024 +0800

    Merge branch 'master' of https://github.com/apache/eventmesh into 
eventmesh-function
    
     Conflicts:
       settings.gradle

 .github/workflows/ci.yml                           |   6 +-
 .github/workflows/code-scanning.yml                |   2 +-
 .github/workflows/license.yml                      |   2 -
 README.md                                          |   6 +-
 README.zh-CN.md                                    |   6 +-
 build.gradle                                       |   4 +-
 eventmesh-meta/eventmesh-meta-consul/build.gradle  |   2 +-
 eventmesh-meta/eventmesh-meta-raft/build.gradle    |  55 +++
 .../eventmesh-meta-raft/gradle.properties          |  31 +-
 .../apache/eventmesh/meta/raft/EventClosure.java   |  83 +++++
 .../apache/eventmesh/meta/raft/EventOperation.java |  68 ++++
 .../eventmesh/meta/raft/JraftMetaService.java}     |  19 +-
 .../eventmesh/meta/raft/JraftMetaServiceImpl.java  |  78 ++++
 .../apache/eventmesh/meta/raft/JraftServer.java    |  95 +++++
 .../eventmesh/meta/raft/MetaStateMachine.java      | 193 ++++++++++
 .../eventmesh/meta/raft/RaftMetaService.java       | 398 +++++++++++++++++++++
 .../raft/config/RaftMetaStorageConfiguration.java  |  50 +++
 .../meta/raft/consts/MetaRaftConstants.java}       |  39 +-
 .../eventmesh/meta/raft/rpc/MetaServerHelper.java  |  97 +++++
 .../eventmesh/meta/raft/rpc/RequestProcessor.java  |  52 +++
 .../meta/raft/snapshot/MetaSnapshotFile.java       |  63 ++++
 .../src/main/proto/request.proto}                  |  22 +-
 .../org.apache.eventmesh.api.meta.MetaService      |  32 +-
 eventmesh-runtime/conf/eventmesh.properties        |  14 +
 eventmesh-runtime/conf/log4j2.xml                  |   9 +
 resources/eventmesh-architecture-5.png             | Bin 0 -> 217382 bytes
 resources/eventmesh-operator.png                   | Bin 0 -> 184473 bytes
 settings.gradle                                    |  14 +-
 28 files changed, 1329 insertions(+), 111 deletions(-)



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to