Merge remote-tracking branch 'remotes/origin/ignite-1003' 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/4d1fa723 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4d1fa723 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4d1fa723 Branch: refs/heads/ignite-sprint-7 Commit: 4d1fa7235c1381bacaaeaf458658675d2ba34923 Parents: 31cf802 b23f930 Author: sboikov <sboi...@gridgain.com> Authored: Thu Jun 18 15:15:49 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jun 18 15:15:49 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 ++++++++++ 4 files changed, 60 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d1fa723/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d1fa723/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d1fa723/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ----------------------------------------------------------------------
