Updated Branches: refs/heads/cassandra-1.1 30e78d6dc -> a4f06c237 refs/heads/trunk 8104a70f0 -> 969a310c5
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/969a310c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/969a310c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/969a310c Branch: refs/heads/trunk Commit: 969a310c5c6cdccf78a525c2b1895a4d9a35644b Parents: 8104a70 a4f06c2 Author: Jonathan Ellis <[email protected]> Authored: Wed May 23 17:17:29 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed May 23 17:17:29 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/969a310c/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 95c5d0a,55a34ef..3d79638 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,5 +1,17 @@@ +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 + * apply parent CF compaction settings to secondary index CFs (CASSANDRA-4280) * preserve commitlog size cap when recycling segments at startup (CASSANDRA-4201) * (Hadoop) fix split generation regression (CASSANDRA-4259) http://git-wip-us.apache.org/repos/asf/cassandra/blob/969a310c/src/java/org/apache/cassandra/config/CFMetaData.java ----------------------------------------------------------------------
