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/7af56b5a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7af56b5a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7af56b5a Branch: refs/heads/cassandra-2.0 Commit: 7af56b5ae4c3b201a2633745042233ef66766ec2 Parents: f3dddb3 1b79d6e Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Sep 24 10:46:48 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Sep 24 10:46:48 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/CassandraDaemon.java | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7af56b5a/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 54b2e9e,a5903fa..4d52c99 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ -1.2.11 +2.0.2 + * Improve memory usage of metadata min/max column names (CASSANDRA-6077) + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081) + * Fix insertion of collections with CAS (CASSANDRA-6069) +Merged from 1.2: + * Start MeteredFlusher earlier to prevent OOM during CL replay (CASSANDRA-6087) * Avoid sending Truncate command to fat clients (CASSANDRA-6088) * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980) * Allow where clause conditions to be in parenthesis (CASSANDRA-6037) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7af56b5a/src/java/org/apache/cassandra/service/CassandraDaemon.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java index 2879f1d,448bb0a..ae8a5a2 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@@ -331,10 -339,7 +335,7 @@@ public class CassandraDaemo }; StorageService.optionalTasks.schedule(runnable, 5 * 60, TimeUnit.SECONDS); - // MeteredFlusher can block if flush queue fills up, so don't put on scheduledTasks - StorageService.optionalTasks.scheduleWithFixedDelay(new MeteredFlusher(), 1000, 1000, TimeUnit.MILLISECONDS); - - SystemTable.finishStartup(); + SystemKeyspace.finishStartup(); // start server internals StorageService.instance.registerDaemon(this);
