Permalink
Browse files

Merge branch 'cassandra-2.1' into trunk

  • Loading branch information...
jbellis committed Feb 28, 2014
2 parents 3c186be + a6f5f36 commit 3666e47a118f26e944fe51c89492b319f9a01b8d
Showing with 0 additions and 7 deletions.
  1. +0 −5 conf/cassandra.yaml
  2. +0 −2 src/java/org/apache/cassandra/config/Config.java
View
@@ -53,11 +53,6 @@ max_hints_delivery_threads: 2
# reduced proportionally to the number of nodes in the cluster.
batchlog_replay_throttle_in_kb: 1024
-# The following setting populates the page cache on memtable flush and compaction
-# WARNING: Enable this setting only when the whole node's data fits in memory.
-# Defaults to: false
-# populate_io_cache_on_flush: false
-
# Authentication backend, implementing IAuthenticator; used to identify users
# Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthenticator,
# PasswordAuthenticator}.
@@ -194,7 +194,6 @@
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;
private static boolean isClientMode = false;
@@ -274,7 +273,6 @@ else if (hinted_handoff_enabled.equalsIgnoreCase("false"))
periodic,
batch
}
-
public static enum InternodeCompression
{
all, none, dc

0 comments on commit 3666e47

Please sign in to comment.