Updated Branches: refs/heads/cassandra-1.1 116d8a1a7 -> 3a04d8548 refs/heads/trunk 8d0dd61b3 -> b51a0d64f
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b51a0d64 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b51a0d64 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b51a0d64 Branch: refs/heads/trunk Commit: b51a0d64f0667dbf46ba7213eefbd96d67f8d463 Parents: 8d0dd61 3a04d85 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue May 1 23:30:48 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue May 1 23:30:48 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../apache/cassandra/db/CollationController.java | 48 ++++++++- .../cassandra/db/commitlog/CommitLogAllocator.java | 4 + .../cassandra/db/commitlog/CommitLogSegment.java | 9 +- .../cassandra/db/CollationControllerTest.java | 83 +++++++++++++++ 5 files changed, 135 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b51a0d64/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index fbb0eb2,c37dd93..bcf15bd --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,6 +1,16 @@@ +1.2-dev + * Track tombstone expiration and compact when tombstone content is + higher than a configurable threshold, default 20% (CASSANDRA-3442) + * update MurmurHash to version 3 (CASSANDRA-2975) + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060) + * (CLI) jline version is bumped to 1.0 to properly support + 'delete' key function (CASSANDRA-4132) + * Save IndexSummary into new SSTable 'Summary' component (CASSANDRA-2392) + + 1.1.1-dev + * Optimize reads when row deletion timestamps allow us to restrict + the set of sstables we check (CASSANDRA-4116) * incremental repair by token range (CASSANDRA-3912) * streaming commitlog backup + pitr (CASSANDRA-3690) * avoid generating redundant compaction tasks during streaming http://git-wip-us.apache.org/repos/asf/cassandra/blob/b51a0d64/src/java/org/apache/cassandra/db/CollationController.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b51a0d64/src/java/org/apache/cassandra/db/commitlog/CommitLogAllocator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b51a0d64/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java ----------------------------------------------------------------------
