Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 107a794d5 -> cf3e748cb


Re-enable getSSTablePreempiveOpenIntervalInMB (ninja)


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cf3e748c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf3e748c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf3e748c

Branch: refs/heads/cassandra-2.1
Commit: cf3e748cbf1faaed68870f22a45edc603eb1b4e8
Parents: 107a794
Author: T Jake Luciani <j...@apache.org>
Authored: Wed Feb 11 16:42:19 2015 -0500
Committer: T Jake Luciani <j...@apache.org>
Committed: Thu Feb 12 09:51:10 2015 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf3e748c/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java 
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 1ee74e9..1dd1688 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -1463,8 +1463,7 @@ public class DatabaseDescriptor
 
     public static int getSSTablePreempiveOpenIntervalInMB()
     {
-        //return conf.sstable_preemptive_open_interval_in_mb;
-        return -1;
+        return conf.sstable_preemptive_open_interval_in_mb;
     }
 
     public static boolean getTrickleFsync()

Reply via email to