Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-6
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/acfe8d58 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/acfe8d58 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/acfe8d58 Branch: refs/heads/ignite-6 Commit: acfe8d58de464622ea29786fddc24999b219309a Parents: 14ed506 082bd57 Author: sboikov <sboi...@gridgain.com> Authored: Thu Feb 5 11:33:43 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Feb 5 11:33:43 2015 +0300 ---------------------------------------------------------------------- .gitignore | 1 + .../config/benchmark-multicast.properties | 74 ++++++++++++++++++++ modules/yardstick/config/benchmark.properties | 70 ++++++++++-------- 3 files changed, 117 insertions(+), 28 deletions(-) ----------------------------------------------------------------------
