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

Posted to commits@ignite.apache.org by vo...@apache.org on 2016/02/05 08:10:13 UTC

[4/5] ignite git commit: Merge branch 'master' into ignite-2523

Merge branch 'master' into ignite-2523


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

Branch: refs/heads/ignite-2523
Commit: 11a27f74f5a85320f6473a4cd2e59e35459cc587
Parents: 1491c1f 532b373
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Feb 5 10:07:02 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Feb 5 10:07:02 2016 +0300

----------------------------------------------------------------------
 .../jmh/cache/JmhCacheAbstractBenchmark.java    |   3 +
 .../benchmarks/jmh/cache/JmhCacheBenchmark.java | 145 +++++++++++++++++++
 .../jmh/cache/JmhCachePutBenchmark.java         | 124 ----------------
 .../jmh/runner/JmhIdeBenchmarkRunner.java       |  20 ++-
 .../ignite/internal/util/nio/GridNioServer.java |  28 +---
 .../osgi-karaf/src/main/resources/features.xml  |  12 +-
 6 files changed, 168 insertions(+), 164 deletions(-)
----------------------------------------------------------------------