Updated Branches: refs/heads/cassandra-1.1 7daa6625a -> 58dceaa6a refs/heads/trunk edf9e0e16 -> ea117154f
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/ea117154 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea117154 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea117154 Branch: refs/heads/trunk Commit: ea117154f15c423e5ee9de2c920b9f69444ac164 Parents: edf9e0e 58dceaa Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Apr 25 10:29:31 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Apr 25 10:29:31 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 9 +++++++++ 2 files changed, 10 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea117154/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a316a49,6a7a67b..00aa405 --- 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 + * streaming commitlog backup + pitr (CASSANDRA-3690) * avoid generating redundant compaction tasks during streaming (CASSANDRA-4174) * add -cf option to nodetool snapshot, and takeColumnFamilySnapshot to
