Merge remote-tracking branch 'remotes/apache-main/ignite-1911' into ignite-801
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5d71e924 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5d71e924 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5d71e924 Branch: refs/heads/ignite-801 Commit: 5d71e92495a6ba880c11488a92637395c7311fb2 Parents: 7d26377 0d3ef8a Author: Denis Magda <[email protected]> Authored: Fri Nov 20 10:38:25 2015 +0300 Committer: Denis Magda <[email protected]> Committed: Fri Nov 20 10:38:25 2015 +0300 ---------------------------------------------------------------------- .../ignite/spi/discovery/tcp/ServerImpl.java | 18 +++++ .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 78 ++++++++++++++++++-- 2 files changed, 91 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5d71e924/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5d71e924/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java ----------------------------------------------------------------------
