You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by iv...@apache.org on 2015/07/21 13:25:18 UTC
[24/29] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-961-master
Merge remote-tracking branch 'remotes/origin/master' into ignite-961-master
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/829311d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/829311d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/829311d9
Branch: refs/heads/ignite-961
Commit: 829311d94570c9d4f238e2ba1cfc000a5f4b4e24
Parents: ec76ec7 9aa928c
Author: ivasilinets <iv...@gridgain.com>
Authored: Tue Jul 21 11:29:59 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Tue Jul 21 11:29:59 2015 +0300
----------------------------------------------------------------------
.../distributed/dht/GridDhtTxPrepareFuture.java | 7 +-
.../ignite/internal/util/nio/GridNioServer.java | 9 ++
.../util/nio/GridSelectorNioSessionImpl.java | 8 ++
.../cache/CacheAffinityCallSelfTest.java | 4 -
.../internal/util/nio/GridNioSelfTest.java | 88 ++++++++++++++++++--
.../internal/util/nio/GridNioSslSelfTest.java | 16 ++--
.../testframework/junits/GridAbstractTest.java | 3 +-
7 files changed, 109 insertions(+), 26 deletions(-)
----------------------------------------------------------------------