Updated Branches: refs/heads/cassandra-1.1 c37fe54f1 -> 30e78d6dc refs/heads/trunk 6e8c23711 -> 8104a70f0
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/8104a70f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8104a70f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8104a70f Branch: refs/heads/trunk Commit: 8104a70f0f289aca89e6eb723765f9171bea142d Parents: 6e8c237 30e78d6 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed May 23 16:33:49 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed May 23 16:33:49 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../cassandra/db/commitlog/CommitLogAllocator.java | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8104a70f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 987d455,c7e3207..95c5d0a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,6 +1,18 @@@ +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) + * Add support for range tombstones (CASSANDRA-3708) + * Improve MessagingService efficiency (CASSANDRA-3617) + + 1.1.1-dev + * preserve commitlog size cap when recycling segments at startup + (CASSANDRA-4201) * (Hadoop) fix split generation regression (CASSANDRA-4259) * ignore min/max compactions settings in LCS, while preserving behavior that min=max=0 disables autocompaction (CASSANDRA-4233) http://git-wip-us.apache.org/repos/asf/cassandra/blob/8104a70f/src/java/org/apache/cassandra/db/commitlog/CommitLogAllocator.java ----------------------------------------------------------------------
