You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/07/21 10:13:27 UTC
[8/8] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-752
Merge remote-tracking branch 'remotes/origin/master' into ignite-752
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/49098e93
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/49098e93
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/49098e93
Branch: refs/heads/ignite-752
Commit: 49098e93e3d353c72934c3224599a7c59d1ee09a
Parents: 05f69a6 9aa928c
Author: Denis Magda <dm...@gridgain.com>
Authored: Tue Jul 21 11:12:42 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue Jul 21 11:12:42 2015 +0300
----------------------------------------------------------------------
.../distributed/dht/GridDhtTxPrepareFuture.java | 7 +-
.../ignite/internal/util/nio/GridNioServer.java | 9 ++
.../util/nio/GridSelectorNioSessionImpl.java | 8 ++
.../IgniteClientReconnectFailoverTest.java | 6 ++
.../cache/CacheAffinityCallSelfTest.java | 10 ++-
.../internal/util/nio/GridNioSelfTest.java | 88 ++++++++++++++++++--
.../internal/util/nio/GridNioSslSelfTest.java | 16 ++--
.../testframework/junits/GridAbstractTest.java | 3 +-
pom.xml | 12 +--
9 files changed, 127 insertions(+), 32 deletions(-)
----------------------------------------------------------------------