You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by nt...@apache.org on 2015/07/24 14:21:39 UTC
[6/6] incubator-ignite git commit: Merge branch 'ignite-1.3.3' into
ignite-1.3.3-sslbench
Merge branch 'ignite-1.3.3' into ignite-1.3.3-sslbench
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/08d5343f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/08d5343f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/08d5343f
Branch: refs/heads/ignite-1.3.3-sslbench
Commit: 08d5343f9cfc5d6292dca93512343bc60036c754
Parents: b7912fd 5082d63
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Fri Jul 24 15:21:40 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Fri Jul 24 15:21:40 2015 +0300
----------------------------------------------------------------------
.../GridClientConnectionManagerAdapter.java | 2 +-
.../client/router/impl/GridTcpRouterImpl.java | 2 +-
.../rest/protocols/tcp/GridTcpRestProtocol.java | 3 +-
.../ignite/internal/util/nio/GridNioServer.java | 30 +++++++--
.../util/nio/ssl/BlockingSslHandler.java | 37 ++++++++++-
.../internal/util/nio/ssl/GridNioSslFilter.java | 55 +++++-----------
.../util/nio/ssl/GridNioSslHandler.java | 69 ++++++++++++++++++--
.../communication/tcp/TcpCommunicationSpi.java | 3 +-
.../IgniteTopologyPrintFormatSelfTest.java | 6 +-
.../distributed/IgniteCache150ClientsTest.java | 1 +
.../internal/util/nio/GridNioSslSelfTest.java | 2 +-
.../GridCommandLineTransformerSelfTest.java | 12 ++--
12 files changed, 154 insertions(+), 68 deletions(-)
----------------------------------------------------------------------