Merge remote-tracking branch 'remotes/origin/master' into ignite-1032
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/99408c9d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/99408c9d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/99408c9d Branch: refs/heads/ignite-1032 Commit: 99408c9d41e4a103011293f262b10e45b28e5a6a Parents: cd5d5cd 9aa928c Author: Denis Magda <[email protected]> Authored: Tue Jul 21 12:46:48 2015 +0300 Committer: Denis Magda <[email protected]> Committed: Tue Jul 21 12:46:48 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(-) ----------------------------------------------------------------------
