You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by as...@apache.org on 2021/03/01 17:06:08 UTC
[ignite-3] 01/02: Merge branch 'main' of
https://gitbox.apache.org/repos/asf/ignite-3 into ignite-14149
This is an automated email from the ASF dual-hosted git repository.
ascherbakov pushed a commit to branch ignite-14149
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit b22ccf8a11de449da6796bffc7c2fe90ddba8fb8
Merge: c4871ce c548a82
Author: Alexey Scherbakov <al...@gmail.com>
AuthorDate: Mon Mar 1 11:06:30 2021 +0300
Merge branch 'main' of https://gitbox.apache.org/repos/asf/ignite-3 into ignite-14149
# Conflicts:
# pom.xml
.../processor/internal/ITProcessorTest.java | 12 +-
.../configuration/processor/internal/Types.java | 3 +
.../internal/TestConfigurationSchema.java | 3 +
.../processor/internal/Processor.java | 138 +++++++---
.../internal/util/ConfigurationUtilTest.java | 32 ++-
.../sample/ConfigurationArrayTest.java | 105 ++++++++
.../sample/storage/ConfigurationChangerTest.java | 69 ++---
.../sample/storage/TestConfigurationStorage.java | 6 +-
.../ignite/configuration/ConfigurationChanger.java | 277 ++++++++++++---------
.../configuration/ConfigurationRegistry.java | 20 ++
.../org/apache/ignite/configuration/RootKey.java | 13 +-
.../apache/ignite/configuration/RootKeyImpl.java | 56 +++++
.../internal/util/ConfigurationUtil.java | 130 +++++++++-
.../storage/ConfigurationStorage.java | 2 +-
.../apache/ignite/configuration/storage/Data.java | 6 +-
.../ignite/configuration/tree/InnerNode.java | 2 +-
modules/network/pom.xml | 98 ++++++++
.../ITScaleCubeNetworkClusterMessagingTest.java | 97 ++++++++
.../ignite/network/scalecube/TestMessage.java} | 62 +++--
.../scalecube/TestNetworkHandlersProvider.java | 63 +++++
.../ignite/network/MessageHandlerHolder.java | 59 +++++
.../org/apache/ignite/network/NetworkCluster.java | 70 ++++++
.../network/NetworkClusterEventHandler.java} | 32 +--
.../ignite/network/NetworkClusterFactory.java | 75 ++++++
.../ignite/network/NetworkHandlersProvider.java} | 31 +--
.../org/apache/ignite/network/NetworkMember.java | 63 +++++
.../org/apache/ignite/network/NetworkMessage.java | 59 +++++
.../ignite/network/NetworkMessageHandler.java} | 15 +-
.../network/scalecube/ScaleCubeMemberResolver.java | 64 +++++
.../network/scalecube/ScaleCubeMessageHandler.java | 100 ++++++++
.../network/scalecube/ScaleCubeNetworkCluster.java | 110 ++++++++
parent/pom.xml | 7 +
pom.xml | 1 +
33 files changed, 1606 insertions(+), 274 deletions(-)
diff --cc pom.xml
index e3afc38,ade1018..ed77364
--- a/pom.xml
+++ b/pom.xml
@@@ -40,7 -40,7 +40,8 @@@
<module>modules/configuration-annotation-processor</module>
<module>modules/rest</module>
<module>modules/runner</module>
+ <module>modules/raft-client</module>
+ <module>modules/network</module>
</modules>
<build>