You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@ignite.apache.org by ra...@apache.org on 2015/10/27 17:06:23 UTC

[4/6] ignite git commit: Merge branch 'master' into ignite-1747

Merge branch 'master' into ignite-1747


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b12663fc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b12663fc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b12663fc

Branch: refs/heads/master
Commit: b12663fc44b2a0b8d0d867aa2c762e62b0c71250
Parents: 0e48722 15cc1bd
Author: Raul Kripalani <ra...@apache.org>
Authored: Mon Oct 26 13:05:46 2015 +0000
Committer: Raul Kripalani <ra...@apache.org>
Committed: Mon Oct 26 13:05:46 2015 +0000

----------------------------------------------------------------------
 .../internal/portable/PortableContext.java      |  12 +--
 .../ignite/internal/util/nio/GridNioServer.java |   2 +-
 ...ledFairAffinityMultiNodeFullApiSelfTest.java |   8 +-
 ...icOffHeapTieredMultiNodeFullApiSelfTest.java |   7 +-
 .../replicated/GridReplicatedTxPreloadTest.java |   7 +-
 .../nio/IgniteExceptionInNioWorkerSelfTest.java | 105 +++++++++++++++++++
 .../tcp/TcpClientDiscoverySpiSelfTest.java      |   4 +-
 .../ignite/testsuites/IgniteBasicTestSuite.java |   3 +
 .../CacheHibernateBlobStoreSelfTest.java        |   6 +-
 .../yardstick/IgniteBenchmarkArguments.java     |  11 ++
 .../cache/IgniteCacheAbstractBenchmark.java     |  63 +++++++++++
 .../cache/IgnitePutAllTxBenchmark.java          |   6 +-
 12 files changed, 220 insertions(+), 14 deletions(-)
----------------------------------------------------------------------