Merge remote-tracking branch 'remotes/origin/ignite-890'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/44043fa2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/44043fa2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/44043fa2 Branch: refs/heads/ignite-884 Commit: 44043fa23ecd282fa69521faaaaa3ef74630f8da Parents: fbc38d7 5c55812 Author: Denis Magda <dma...@gridgain.com> Authored: Thu Jul 16 16:36:48 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Thu Jul 16 16:36:48 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 14 +- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 35 ++++- .../tcp/TcpDiscoveryMultiThreadedTest.java | 140 ++++++++++++------- 4 files changed, 131 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44043fa2/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44043fa2/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44043fa2/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ----------------------------------------------------------------------
