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 2017/05/29 09:08:48 UTC
[2/2] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-5075' into ignite-5075-pds
Merge remote-tracking branch 'remotes/origin/ignite-5075' into ignite-5075-pds
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a6a92a7d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a6a92a7d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a6a92a7d
Branch: refs/heads/ignite-5075-pds
Commit: a6a92a7db7bf3d36e5591b116b9204e231354fe2
Parents: dba7dbd 63fa2bd
Author: sboikov <sb...@gridgain.com>
Authored: Mon May 29 12:07:08 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon May 29 12:07:08 2017 +0300
----------------------------------------------------------------------
.../internal/processors/cache/GridCacheProcessor.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a6a92a7d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 67770ce,21dc5ea..3e0f2c2
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@@ -1219,12 -1223,13 +1221,8 @@@ public class GridCacheProcessor extend
cacheCtx.onStarted();
-- if (log.isInfoEnabled()) {
-- log.info("Started cache [name=" + cfg.getName() +
-- (cfg.getGroupName() != null ? ", group=" + cfg.getGroupName() : "") +
-- ", memoryPolicyName=" + cfg.getMemoryPolicyName() +
- ", mode=" + cfg.getCacheMode() + ", atomicity=" + cfg.getAtomicityMode() + ']');
- ", mode=" + cfg.getCacheMode() +
- ", atomicity=" + cfg.getAtomicityMode() + ']');
-- }
++ if (log.isInfoEnabled()){
++ log.info("Started cache [name=" + cfg.getName() +(cfg.getGroupName() != null ? ", group=" + cfg.getGroupName() : "") + ", memoryPolicyName=" + cfg.getMemoryPolicyName() + ", mode=" + cfg.getCacheMode() +", atomicity=" + cfg.getAtomicityMode() + ']');}
}
/**