Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ad0a026f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ad0a026f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ad0a026f Branch: refs/heads/ignite-917-review Commit: ad0a026f480ff67025b39737c2e068b20035feb6 Parents: fc81bcf 8c404f7 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Thu Jun 18 15:54:59 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Thu Jun 18 15:54:59 2015 +0300 ---------------------------------------------------------------------- .../communication/tcp/TcpCommunicationSpi.java | 38 ++++++++++---------- .../ignite/spi/discovery/tcp/ServerImpl.java | 21 +++++++---- .../spi/discovery/tcp/TcpDiscoverySpi.java | 9 ++++- .../tcp/internal/TcpDiscoveryNode.java | 18 ++++++++++ .../apache/ignite/internal/GridSelfTest.java | 20 ++++++----- 5 files changed, 72 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad0a026f/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad0a026f/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ----------------------------------------------------------------------
