Merge remote-tracking branch 'remotes/origin/ignite-1.6'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a288a442 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a288a442 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a288a442 Branch: refs/heads/master Commit: a288a44254249464f772881e8368af4f3517db64 Parents: 6b3328b 2d5d124 Author: Denis Magda <[email protected]> Authored: Thu May 12 12:07:07 2016 +0300 Committer: Denis Magda <[email protected]> Committed: Thu May 12 12:07:07 2016 +0300 ---------------------------------------------------------------------- .../config/benchmark-cache-load-win.properties | 6 +- .../config/benchmark-cache-load.properties | 19 +- .../yardstick/IgniteBenchmarkArguments.java | 21 +- .../IgniteCacheRandomOperationBenchmark.java | 656 +++++++++++-------- .../yardstick/cache/load/model/ModelUtil.java | 4 +- 5 files changed, 392 insertions(+), 314 deletions(-) ----------------------------------------------------------------------
