ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [4/4] incubator-ignite git commit: Merge branches 'ignite-55' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-55
Date Wed, 11 Feb 2015 08:03:33 GMT
Merge branches 'ignite-55' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-55


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/600bc9e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/600bc9e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/600bc9e3

Branch: refs/heads/ignite-55
Commit: 600bc9e3c6738e2ccd0d5f9933bfe7fa1d568389
Parents: 3fc0cb5 1d04fc7
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Wed Feb 11 14:56:48 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Wed Feb 11 14:56:48 2015 +0700

----------------------------------------------------------------------
 config/hadoop/default-config.xml                               | 6 +++++-
 .../ignite/internal/processors/cache/GridCacheContext.java     | 4 ++--
 .../ignite/internal/processors/cache/GridCacheProcessor.java   | 5 ++---
 .../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 +++++-
 .../apache/ignite/loadtests/hashmap/GridCacheTestContext.java  | 2 +-
 modules/core/src/test/webapp/META-INF/gg-config.xml            | 6 +++++-
 8 files changed, 30 insertions(+), 11 deletions(-)
----------------------------------------------------------------------



Mime
View raw message