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 2015/05/27 16:48:57 UTC
[06/38] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-709_2' into ignite-23
Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-23
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fcf02fef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fcf02fef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fcf02fef
Branch: refs/heads/ignite-709_2
Commit: fcf02fef4daf124b1283f0d9c111d1c0bda6deec
Parents: 632a01a ecf34ca
Author: sboikov <se...@inria.fr>
Authored: Tue May 19 22:15:20 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Tue May 19 22:15:20 2015 +0300
----------------------------------------------------------------------
.../discovery/tcp/TcpClientDiscoverySpi.java | 17 ++-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 23 ++--
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 11 +-
.../internal/GridReleaseTypeSelfTest.java | 92 +++++++++-----
.../GridDiscoveryManagerAliveCacheSelfTest.java | 12 +-
.../GridDiscoveryManagerAttributesSelfTest.java | 121 +++++++++++--------
.../discovery/GridDiscoveryManagerSelfTest.java | 44 +++++--
.../IgniteClientDataStructuresAbstractTest.java | 19 +--
...ientModesTcpClientDiscoveryAbstractTest.java | 21 +---
...pClientDiscoveryMarshallerCheckSelfTest.java | 18 +--
.../tcp/TcpClientDiscoverySpiSelfTest.java | 2 -
.../tcp/TcpDiscoveryConcurrentStartTest.java | 20 +--
.../testframework/junits/GridAbstractTest.java | 6 +-
.../junits/common/GridCommonAbstractTest.java | 31 +++++
.../testsuites/IgniteKernalSelfTestSuite.java | 6 +-
15 files changed, 251 insertions(+), 192 deletions(-)
----------------------------------------------------------------------