Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/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/aec97640 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aec97640 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aec97640 Branch: refs/heads/ignite-1093 Commit: aec97640713ecd808440cc48825910d574815cb7 Parents: 6b0552c 271550f Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Jul 31 14:36:01 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Jul 31 14:36:01 2015 +0300 ---------------------------------------------------------------------- .../GridDhtPartitionsExchangeFuture.java | 20 +++++---- .../communication/tcp/TcpCommunicationSpi.java | 41 +++++++++++++++--- .../ignite/spi/discovery/tcp/ServerImpl.java | 45 +++++++++++--------- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 8 ++-- 5 files changed, 77 insertions(+), 39 deletions(-) ----------------------------------------------------------------------
