You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/08/29 19:53:09 UTC
[3/3] git commit: merge from 2.0
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/73e27b07
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/73e27b07
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/73e27b07
Branch: refs/heads/trunk
Commit: 73e27b07f588b0ace8255090d3840903893a7435
Parents: c146f43 c1e0f31
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Aug 29 12:52:58 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Aug 29 12:52:58 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../db/compaction/LeveledManifest.java | 20 +++++++++++---------
2 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/73e27b07/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index fdfcc0a,2d3ee24..7d7feaf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,6 +1,10 @@@
+2.1
+ * change logging from log4j to logback (CASSANDRA-5883)
+
+
2.0.1
+ * Improve leveled compaction's ability to find non-overlapping L0 compactions
+ to work on concurrently (CASSANDRA-5921)
* Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)
* Log Merkle tree stats (CASSANDRA-2698)
* Switch from crc32 to adler32 for compressed sstable checksums (CASSANDRA-5862)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/73e27b07/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
----------------------------------------------------------------------