You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/08/03 17:15:53 UTC
[02/32] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-1.3.3' into ignite-1.3.3
Merge remote-tracking branch 'origin/ignite-1.3.3' into ignite-1.3.3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eccaa47f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eccaa47f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eccaa47f
Branch: refs/heads/ignite-1142
Commit: eccaa47f4c74c5fa6f506684b82da4cd0f7664ba
Parents: 1770f3c 5082d63
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Fri Jul 24 16:28:10 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Fri Jul 24 16:28:10 2015 +0300
----------------------------------------------------------------------
.../GridClientConnectionManagerAdapter.java | 2 +-
.../client/router/impl/GridTcpRouterImpl.java | 2 +-
.../rest/protocols/tcp/GridTcpRestProtocol.java | 3 +-
.../util/nio/ssl/BlockingSslHandler.java | 37 ++++++++++-
.../internal/util/nio/ssl/GridNioSslFilter.java | 49 ++++----------
.../util/nio/ssl/GridNioSslHandler.java | 69 ++++++++++++++++++--
.../communication/tcp/TcpCommunicationSpi.java | 3 +-
.../internal/util/nio/GridNioSslSelfTest.java | 2 +-
8 files changed, 117 insertions(+), 50 deletions(-)
----------------------------------------------------------------------