git commit: add #6142 to CHANGES + NEWS

[jb...@apache.org]

Updated Branches:
  refs/heads/trunk b01b67a00 -> 22b9e08b6


add #6142 to CHANGES + NEWS


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/22b9e08b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/22b9e08b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/22b9e08b

Branch: refs/heads/trunk
Commit: 22b9e08b6b6ab252d5d8d172378f5b6e2825ecd8
Parents: b01b67a
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Nov 19 16:34:58 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Nov 19 16:34:58 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt | 1 +
 NEWS.txt    | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/22b9e08b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 24cbf79..2e59f4e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1
+ * Removed multithreaded compaction (CASSANDRA-6142)
  * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
  * change logging from log4j to logback (CASSANDRA-5883)
  * switch to LZ4 compression for internode communication (CASSANDRA-5887)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/22b9e08b/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 1b33572..59ceb92 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -27,6 +27,7 @@ Upgrading
      the coldest 5% of sstables.  This can be customized with the
      cold_reads_to_omit compaction option; 0.0 omits nothing (the old
      behavior) and 1.0 omits everything.
+   - Multithreaded compaction has been removed.
 
 
 2.0.3