Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9e07a28a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9e07a28a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9e07a28a Branch: refs/heads/trunk Commit: 9e07a28ac6368143e96ffc7c56e8cccfac444bec Parents: 8201299 6487bc5 Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Jan 11 16:12:33 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Jan 11 16:12:33 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra.yaml | 6 ++++++ src/java/org/apache/cassandra/config/Config.java | 2 ++ .../cassandra/config/DatabaseDescriptor.java | 5 +++++ .../cassandra/net/OutboundTcpConnection.java | 9 ++++++++- 5 files changed, 22 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e07a28a/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 5462ebd,64cc60c..d71b77c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,5 +1,12 @@@ +1.3 + * make index_interval configurable per columnfamily (CASSANDRA-3961) + * add default_tim_to_live (CASSANDRA-3974) + * add memtable_flush_period_in_ms (CASSANDRA-4237) + * replace supercolumns internally by composites (CASSANDRA-3237) + + 1.2.1 + * add inter_dc_tcp_nodelay setting (CASSANDRA-5148) * re-allow wrapping ranges for start_token/end_token range pairing (CASSANDRA-5106) * fix validation compaction of empty rows (CASSADRA-5136) * nodetool methods to enable/disable hint storage/delivery (CASSANDRA-4750) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e07a28a/conf/cassandra.yaml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e07a28a/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/config/Config.java index 4dd1dff,cff578c..af47e84 --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@@ -161,9 -160,10 +161,11 @@@ public class Confi 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 inter_dc_tcp_nodelay = true; + private static boolean loadYaml = true; private static boolean outboundBindAny = false; http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e07a28a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
