cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Fri, 28 Feb 2014 16:41:26 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: a6f5f361caeaf0e4a77366dd85ac47940e3a7f85
Parents: b41eb4a 5b80b97
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri Feb 28 10:40:55 2014 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri Feb 28 10:41:12 2014 -0600

----------------------------------------------------------------------
 conf/cassandra.yaml                              | 5 -----
 src/java/org/apache/cassandra/config/Config.java | 2 --
 2 files changed, 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6f5f361/conf/cassandra.yaml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6f5f361/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/Config.java
index b2eedba,e8e43e2..a9b9237
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@@ -187,14 -178,9 +187,13 @@@ public class Confi
  
      public long row_cache_size_in_mb = 0;
      public volatile int row_cache_save_period = 0;
 -    public int row_cache_keys_to_save = Integer.MAX_VALUE;
 +    public volatile int row_cache_keys_to_save = Integer.MAX_VALUE;
 +
 +    public Long counter_cache_size_in_mb = null;
 +    public volatile int counter_cache_save_period = 7200;
 +    public volatile int counter_cache_keys_to_save = Integer.MAX_VALUE;
 +
      public String memory_allocator = NativeAllocator.class.getSimpleName();
-     public boolean populate_io_cache_on_flush = false;
 -    public boolean populate_io_cache_on_flush = false; // ignored! see CASSANDRA-4694
  
      private static boolean isClientMode = false;
  


Mime
View raw message