You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2015/06/05 04:34:49 UTC
[10/50] incubator-ignite git commit: Merge branches 'ignite-916' and
'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-916
Merge branches 'ignite-916' and 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-916
Conflicts:
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/adc7b234
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/adc7b234
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/adc7b234
Branch: refs/heads/ignite-389
Commit: adc7b234708cb53a026fcf488fa2aaa03bac02fc
Parents: 859f182
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Tue Jun 2 16:23:32 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Tue Jun 2 16:23:32 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/yardstick/IgniteNode.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/adc7b234/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
index 2027b80..8638623 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
@@ -104,11 +104,8 @@ public class IgniteNode implements BenchmarkServer {
if (args.isOffheapValues())
cc.setMemoryMode(OFFHEAP_VALUES);
- else {
- LruEvictionPolicy plc = new LruEvictionPolicy();
- plc.setMaxSize(50000);
- cc.setEvictionPolicy(plc);
- }
+ else
+ cc.setEvictionPolicy(new LruEvictionPolicy(50000));
}
cc.setReadThrough(args.isStoreEnabled());