Merge branches 'ignite-1.5' and 'ignite-1.5-atomic-opt' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5-atomic-opt
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2c75100e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2c75100e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2c75100e Branch: refs/heads/ignite-1.5-atomic-opt Commit: 2c75100e9c29029fdb7e5bccb9d483ca67df44b5 Parents: dd76483 1f5a409 Author: Yakov Zhdanov <[email protected]> Authored: Thu Nov 12 17:32:30 2015 +0300 Committer: Yakov Zhdanov <[email protected]> Committed: Thu Nov 12 17:32:30 2015 +0300 ---------------------------------------------------------------------- modules/yardstick/README.txt | 16 ++-- .../yardstick/config/benchmark-store.properties | 86 ++++++++++++-------- 2 files changed, 59 insertions(+), 43 deletions(-) ----------------------------------------------------------------------
