Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/88ffed13 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/88ffed13 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/88ffed13 Branch: refs/heads/ignite-1786 Commit: 88ffed13527d43cbfa204ae90cc39722fa3a77c4 Parents: ebf4075 0b10e0c Author: vozerov-gridgain <[email protected]> Authored: Fri Mar 18 16:38:58 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Fri Mar 18 16:38:58 2016 +0300 ---------------------------------------------------------------------- .../managers/communication/GridIoManager.java | 10 ++++ .../GridCachePartitionExchangeManager.java | 3 ++ .../util/nio/GridNioRecoveryDescriptor.java | 21 +++++++- .../ignite/internal/util/nio/GridNioServer.java | 52 +++++++++++++++++++- .../communication/tcp/TcpCommunicationSpi.java | 8 +++ .../tcp/TcpCommunicationSpiMBean.java | 8 ++- 6 files changed, 98 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
