You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/12/08 13:43:12 UTC
[9/9] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-zk' into ignite-zk-alpha
Merge remote-tracking branch 'remotes/origin/ignite-zk' into ignite-zk-alpha
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0ff79e7b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0ff79e7b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0ff79e7b
Branch: refs/heads/ignite-zk-alpha
Commit: 0ff79e7bf90f622912065df911f32d10cfb0ca6e
Parents: afa2214 e3f4c6d
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 8 16:42:55 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 8 16:42:55 2017 +0300
----------------------------------------------------------------------
.../cache/CacheAffinitySharedManager.java | 9 +-
.../continuous/ContinuousRoutinesInfo.java | 71 ++++++-----
.../continuous/GridContinuousProcessor.java | 16 ++-
.../spi/discovery/zk/ZookeeperDiscoverySpi.java | 13 +-
.../zk/internal/ZookeeperClusterNode.java | 9 ++
.../zk/internal/ZookeeperDiscoveryImpl.java | 48 +++----
.../internal/ClusterGroupHostsSelfTest.java | 3 +
.../internal/DiscoverySpiTestListener.java | 27 ++--
.../ignite/internal/GridDiscoverySelfTest.java | 2 +
.../GridJobMasterLeaveAwareSelfTest.java | 2 +
.../internal/GridJobStealingSelfTest.java | 2 +
.../IgniteClientReconnectApiExceptionTest.java | 6 +-
.../IgniteClientReconnectCacheTest.java | 8 +-
.../GridDiscoveryManagerAliveCacheSelfTest.java | 16 ++-
.../IgniteDaemonNodeMarshallerCacheTest.java | 3 +-
...ntNodeBinaryObjectMetadataMultinodeTest.java | 2 +-
.../CacheLateAffinityAssignmentTest.java | 9 +-
...GridServiceProxyClientReconnectSelfTest.java | 8 +-
.../ignite/messaging/GridMessagingSelfTest.java | 126 ++++---------------
.../ZookeeperDiscoverySpiBasicTest.java | 20 ++-
.../testframework/junits/GridAbstractTest.java | 4 +-
.../DynamicIndexAbstractBasicSelfTest.java | 4 +-
22 files changed, 188 insertions(+), 220 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0ff79e7b/modules/core/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiBasicTest.java
----------------------------------------------------------------------