Updated Branches: refs/heads/cassandra-1.1 58dceaa6a -> cc68c49f4 refs/heads/trunk ea117154f -> a05a5641f
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/a05a5641 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a05a5641 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a05a5641 Branch: refs/heads/trunk Commit: a05a5641fffe0b44c32658843df8acee2765c13d Parents: ea11715 cc68c49 Author: Jonathan Ellis <[email protected]> Authored: Wed Apr 25 11:22:25 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Apr 25 11:22:25 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a05a5641/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 00aa405,ad2e12e..3d0b64a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,5 +1,15 @@@ +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 + * incremental repair by token range (CASSANDRA-3912) * streaming commitlog backup + pitr (CASSANDRA-3690) * avoid generating redundant compaction tasks during streaming (CASSANDRA-4174)
