Merge branch 'ignite-1241-dev' of https://github.com/dmagda/incubator-ignite
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ad121478 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ad121478 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ad121478 Branch: refs/heads/ignite-gg-10606 Commit: ad121478b6f6d0d733e8d651a541f03b4fb849f4 Parents: 45c813a 38070b2 Author: Denis Magda <dma...@gridgain.com> Authored: Mon Aug 17 17:11:54 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Mon Aug 17 17:11:54 2015 +0300 ---------------------------------------------------------------------- .../ignite/spi/discovery/tcp/ServerImpl.java | 26 ++++++++++++++------ .../spi/discovery/tcp/TcpDiscoveryImpl.java | 4 +-- .../spi/discovery/tcp/TcpDiscoverySpi.java | 4 --- .../tcp/internal/TcpDiscoveryNode.java | 18 +++++++------- .../tcp/internal/TcpDiscoveryNodesRing.java | 23 +++++++++++++++++ 5 files changed, 53 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad121478/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad121478/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ----------------------------------------------------------------------
