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/18 11:31:38 UTC

[29/29] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-709_2' into ignite-709_2

Merge remote-tracking branch 'origin/ignite-709_2' into ignite-709_2


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

Branch: refs/heads/ignite-709_2
Commit: c1fd8e7060b7a395eb9369be95888f7db134b558
Parents: 69fcdf5 ed76bf0
Author: sboikov <sb...@gridgain.com>
Authored: Mon May 18 12:30:55 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon May 18 12:30:55 2015 +0300

----------------------------------------------------------------------
 .../internal/interop/InteropIgnition.java       | 65 +++++++++++++++++++-
 .../internal/interop/InteropProcessor.java      | 13 +++-
 .../discovery/tcp/TcpClientDiscoverySpi.java    | 22 +++++--
 .../spi/discovery/tcp/TcpDiscoverySpi.java      | 39 +++++-------
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   | 22 ++++---
 .../messages/TcpDiscoveryAbstractMessage.java   | 17 -----
 6 files changed, 122 insertions(+), 56 deletions(-)
----------------------------------------------------------------------