ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ivasilin...@apache.org
Subject [3/3] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-961-master
Date Tue, 21 Jul 2015 08:30:25 GMT
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-master
Commit: 829311d94570c9d4f238e2ba1cfc000a5f4b4e24
Parents: ec76ec7 9aa928c
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Tue Jul 21 11:29:59 2015 +0300
Committer: ivasilinets <ivasilinets@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(-)
----------------------------------------------------------------------



Mime
View raw message