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 13:25:42 UTC

[06/14] ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-gc-opts

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-gc-opts


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

Branch: refs/heads/ignite-2329-1
Commit: f8a55ad63d5f98e6c2663e35785dbf51beb412b2
Parents: dcdf2da d2a107b
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Fri Jan 29 14:36:08 2016 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Fri Jan 29 14:36:08 2016 +0300

----------------------------------------------------------------------
 modules/benchmarks/pom.xml                      |  2 +-
 .../jmh/cache/JmhCachePutBenchmark.java         |  2 +
 .../jmh/runner/JmhIdeBenchmarkRunner.java       | 18 +++++++
 .../dht/preloader/GridDhtPartitionDemander.java |  4 +-
 .../GridServicePackagePrivateSelfTest.java      | 17 ++++---
 modules/docker/1.5.0.final/Dockerfile           | 40 ++++++++++++++++
 modules/docker/1.5.0.final/run.sh               | 50 ++++++++++++++++++++
 modules/docker/Dockerfile                       |  6 +--
 8 files changed, 128 insertions(+), 11 deletions(-)
----------------------------------------------------------------------