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/04/16 23:24:35 UTC
[2/6] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1
Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac21a555
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac21a555
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac21a555
Branch: refs/heads/cassandra-1.1
Commit: ac21a555c5a7190bba90cd1fba2a231b8473e62a
Parents: 211bc0c b184972
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Apr 16 16:24:11 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Apr 16 16:24:11 2012 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../cassandra/hadoop/ColumnFamilyRecordReader.java | 13 +++++++------
2 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac21a555/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1b8377a,be3264a..716a5b6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,6 +1,20 @@@
+1.1.1-dev
+ * optimize cleanup to drop entire sstables where possible (CASSANDRA-4079)
+ * optimize truncate when autosnapshot is disabled (CASSANDRA-4153)
+ * add support for commitlog archiving and point-in-time recovery
+ (CASSANDRA-3647)
+ * update caches to use byte[] keys to reduce memory overhead (CASSANDRA-3966)
+ * add column limit to cli (CASSANDRA-3012, 4098)
+ * clean up and optimize DataOutputBuffer, used by CQL compression and
+ CompositeType (CASSANDRA-4072)
+ * 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
+ * (Hadoop) fix wide row iteration when last row read was deleted
+ (CASSANDRA-4154)
* fix read_repair_chance to really default to 0.1 in the cli (CASSANDRA-4114)
* Adds caching and bloomFilterFpChange to CQL options (CASSANDRA-4042)
* Adds posibility to autoconfigure size of the KeyCache (CASSANDRA-4087)