ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yzhda...@apache.org
Subject [8/8] incubator-ignite git commit: Merge branches 'ignite-96' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-96
Date Wed, 11 Feb 2015 09:16:01 GMT
Merge branches 'ignite-96' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-96

Conflicts:
	modules/core/src/test/webapp/META-INF/gg-config.xml


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

Branch: refs/heads/ignite-96
Commit: 7e8b6c747705ed82387313bbc779582437f08f65
Parents: 2ea5785 d71f260
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Wed Feb 11 12:15:39 2015 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Wed Feb 11 12:15:39 2015 +0300

----------------------------------------------------------------------
 config/hadoop/default-config.xml                |  6 +-
 .../src/test/resources/spring-server-node.xml   | 98 ++++++++++----------
 .../test/resources/spring-server-ssl-node.xml   | 98 ++++++++++----------
 .../processors/cache/GridCacheContext.java      |  4 +-
 .../processors/cache/GridCacheProcessor.java    |  5 +-
 .../spring-cache-client-benchmark-1.xml         |  6 +-
 .../spring-cache-client-benchmark-2.xml         |  6 +-
 .../spring-cache-client-benchmark-3.xml         |  6 +-
 .../loadtests/hashmap/GridCacheTestContext.java |  2 +-
 .../core/src/test/webapp/META-INF/gg-config.xml |  7 ++
 .../hadoop/GridHadoopClassLoader.java           |  2 +-
 .../commands/cache/VisorCacheCommand.scala      |  2 +-
 12 files changed, 128 insertions(+), 114 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e8b6c74/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e8b6c74/modules/core/src/test/webapp/META-INF/gg-config.xml
----------------------------------------------------------------------


Mime
View raw message