Merge remote-tracking branch 'remotes/origin/master' into ignite-1090
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/41172fbf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/41172fbf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/41172fbf Branch: refs/heads/ignite-1090 Commit: 41172fbfe6c35d2379c73a01af222e4a6c7e4a3e Parents: 8446d0f 83bba05 Author: sboikov <[email protected]> Authored: Tue Jul 21 13:41:55 2015 +0300 Committer: sboikov <[email protected]> Committed: Tue Jul 21 13:41:55 2015 +0300 ---------------------------------------------------------------------- .../distributed/dht/GridDhtTxPrepareFuture.java | 7 +- .../ignite/internal/util/IgniteUtils.java | 21 +++-- .../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 +- 8 files changed, 125 insertions(+), 31 deletions(-) ----------------------------------------------------------------------
