Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/MeteredFlusher.java src/java/org/apache/cassandra/service/CassandraDaemon.java
EugenCepoi · Dec 19, 2014 · d9f5702 · d9f5702
2 parents 6fe6d65 + 5f54285
commit d9f5702
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -41,6 +41,7 @@
  * Log failed host when preparing incremental repair (CASSANDRA-8228)
  * Force config client mode in CQLSSTableWriter (CASSANDRA-8281)
 Merged from 2.0:
+ * Move MeteredFlusher to its own thread (CASSANDRA-8485)
  * Fix non-distinct results in DISTNCT queries on static columns when
    paging is enabled (CASSANDRA-8087)
  * Move all hints related tasks to hints internal executor (CASSANDRA-8285)