Merge remote-tracking branch 'origin/sprint-1' into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1d04fc72 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1d04fc72 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1d04fc72 Branch: refs/heads/ignite-204 Commit: 1d04fc7214182d42864bc7a9d71a41e324cda7ab Parents: fbeb9e0 61d0478 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Tue Feb 10 23:29:21 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Tue Feb 10 23:29:21 2015 -0800 ---------------------------------------------------------------------- config/hadoop/default-config.xml | 6 +++++- .../test/config/benchmark/spring-cache-client-benchmark-1.xml | 6 +++++- .../test/config/benchmark/spring-cache-client-benchmark-2.xml | 6 +++++- .../test/config/benchmark/spring-cache-client-benchmark-3.xml | 6 +++++- modules/core/src/test/webapp/META-INF/gg-config.xml | 6 +++++- 5 files changed, 25 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
