merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b80b97d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b80b97d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b80b97d Branch: refs/heads/trunk Commit: 5b80b97ded51bcc2bb0cb0a2f3dc0616d0ed4a30 Parents: 319b42e e5b92d8 Author: Jonathan Ellis <[email protected]> Authored: Fri Feb 28 10:40:43 2014 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Fri Feb 28 10:40:43 2014 -0600 ---------------------------------------------------------------------- conf/cassandra.yaml | 5 ----- src/java/org/apache/cassandra/config/Config.java | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b80b97d/conf/cassandra.yaml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b80b97d/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/config/Config.java index 876770c,b0c8b09..e8e43e2 --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@@ -179,15 -167,9 +179,15 @@@ 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 String row_cache_provider = SerializingCacheProvider.class.getSimpleName(); + 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; + + public boolean preheat_kernel_page_cache = false; + + public Integer file_cache_size_in_mb; + public boolean inter_dc_tcp_nodelay = true; public String memtable_allocator = "SlabAllocator";
