You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dm...@apache.org on 2015/09/23 13:26:30 UTC

[3/3] ignite git commit: Merge remote-tracking branch 'remotes/apache-main/ignite-1.4' into ignite-1272

Merge remote-tracking branch 'remotes/apache-main/ignite-1.4' into ignite-1272


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/70b8d3d7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/70b8d3d7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/70b8d3d7

Branch: refs/heads/ignite-1272
Commit: 70b8d3d7474ff75716e29b1b88c88c11b1a59d85
Parents: 1ff1fea 04f4f54
Author: Denis Magda <dm...@gridgain.com>
Authored: Wed Sep 23 14:25:32 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Wed Sep 23 14:25:32 2015 +0300

----------------------------------------------------------------------
 .../ignite/spi/discovery/tcp/ServerImpl.java    | 97 +++++++++++---------
 ...lientDiscoverySpiFailureTimeoutSelfTest.java | 33 +++++--
 2 files changed, 81 insertions(+), 49 deletions(-)
----------------------------------------------------------------------