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/01 13:09:49 UTC
[4/6] ignite git commit: Merge branch 'master' into ignite-2498
Merge branch 'master' into ignite-2498
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9103b201
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9103b201
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9103b201
Branch: refs/heads/master
Commit: 9103b201c4edf68b0fa75f05f5936e5ca637a0ac
Parents: 14a5f93 c081e3d
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Jan 29 13:10:59 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Jan 29 13:10:59 2016 +0300
----------------------------------------------------------------------
modules/benchmarks/pom.xml | 2 +-
.../jmh/cache/JmhCachePutBenchmark.java | 2 +
.../jmh/runner/JmhIdeBenchmarkRunner.java | 18 +++++++
.../GridServicePackagePrivateSelfTest.java | 17 ++++---
modules/docker/1.5.0.final/Dockerfile | 40 ++++++++++++++++
modules/docker/1.5.0.final/run.sh | 50 ++++++++++++++++++++
modules/docker/Dockerfile | 6 +--
7 files changed, 125 insertions(+), 10 deletions(-)
----------------------------------------------------------------------