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/d1151d49 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d1151d49 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d1151d49 Branch: refs/heads/master Commit: d1151d49ee309c02075128cb9eb1ee78a32ee7d7 Parents: 9bf15f2 28196d0 Author: Anton Vinogradov <[email protected]> Authored: Wed May 11 15:00:33 2016 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Wed May 11 15:00:33 2016 +0300 ---------------------------------------------------------------------- modules/yardstick/config/benchmark-cache-load.properties | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
