Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/38810b63 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/38810b63 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/38810b63 Branch: refs/heads/ignite-gg-9615 Commit: 38810b639fbcf6f5a07302f02c48226f4156de9d Parents: e1f0152 52c1dfa Author: S.Vladykin <svlady...@gridgain.com> Authored: Tue Aug 4 17:52:08 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Tue Aug 4 17:52:08 2015 +0300 ---------------------------------------------------------------------- .../yardstick/config/benchmark-query.properties | 3 +- modules/yardstick/config/ignite-base-config.xml | 2 - .../yardstick/IgniteBenchmarkArguments.java | 11 ++ .../cache/IgniteJdbcSqlQueryBenchmark.java | 134 +++++++++++++++++++ 4 files changed, 147 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
