You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/01 20:16:30 UTC
[1/2] incubator-ignite git commit: # IGNITE-883 Don't create
FileSwapSpi for clients.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-218 95895ce6d -> 19ec02211
# IGNITE-883 Don't create FileSwapSpi for clients.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/541b1e0f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/541b1e0f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/541b1e0f
Branch: refs/heads/ignite-218
Commit: 541b1e0f67089c3e6038ef787fd145977c84084b
Parents: 97d0b04
Author: sevdokimov <se...@gridgain.com>
Authored: Mon Jun 1 20:49:06 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Mon Jun 1 20:49:06 2015 +0300
----------------------------------------------------------------------
.../core/src/main/java/org/apache/ignite/internal/IgnitionEx.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/541b1e0f/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 6e4efb5..21f6652 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1844,7 +1844,7 @@ public class IgnitionEx {
if (cfg.getSwapSpaceSpi() == null) {
boolean needSwap = false;
- if (cfg.getCacheConfiguration() != null) {
+ if (cfg.getCacheConfiguration() != null && !Boolean.TRUE.equals(cfg.isClientMode())) {
for (CacheConfiguration c : cfg.getCacheConfiguration()) {
if (c.isSwapEnabled()) {
needSwap = true;
[2/2] incubator-ignite git commit: Merge branch 'ignite-sprint-5' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-218
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-218
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/19ec0221
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/19ec0221
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/19ec0221
Branch: refs/heads/ignite-218
Commit: 19ec02211c0eac1af27ffb440a67f464727319f1
Parents: 95895ce 541b1e0
Author: iveselovskiy <iv...@gridgain.com>
Authored: Mon Jun 1 21:16:15 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Mon Jun 1 21:16:15 2015 +0300
----------------------------------------------------------------------
.../core/src/main/java/org/apache/ignite/internal/IgnitionEx.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------