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 2012/03/23 16:02:57 UTC
[3/12] git commit: merge from 1.1.0
merge from 1.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d685f45e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d685f45e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d685f45e
Branch: refs/heads/trunk
Commit: d685f45ee636a2d609b39e91d65b51c47e152b51
Parents: 11bdcd6 5697c39
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Mar 23 09:59:43 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Mar 23 09:59:43 2012 -0500
----------------------------------------------------------------------
CHANGES.txt | 3 +-
build.xml | 2 +-
debian/changelog | 8 +-
.../org/apache/cassandra/cache/IRowCacheEntry.java | 27 +++-
.../apache/cassandra/cache/RowCacheSentinel.java | 107 +++++++++------
.../apache/cassandra/io/sstable/SSTableReader.java | 25 ++--
.../org/apache/cassandra/utils/ByteBufferUtil.java | 4 +-
.../cassandra/io/sstable/SSTableReaderTest.java | 42 ++++++
8 files changed, 153 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d685f45e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 3f3da58,0c726fd..8355543
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,4 +1,10 @@@
+1.1.1-dev
+ * optimize commitlog checksumming (CASSANDRA-3610)
+ * identify and blacklist corrupted SSTables from future compactions (CASSANDRA-2261)
+ * Move CfDef and KsDef validation out of thrift (CASSANDRA-4037)
+
+
- 1.1-dev
+ 1.1-beta2
* rename loaded sstables to avoid conflicts with local snapshots
(CASSANDRA-3967)
* start hint replay as soon as FD notifies that the target is back up
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d685f45e/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
----------------------------------------------------------------------