Updated Branches: refs/heads/cassandra-1.1 783e5d4c5 -> 5979bce8e refs/heads/trunk 4c63c8656 -> 9263835ba
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/9263835b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9263835b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9263835b Branch: refs/heads/trunk Commit: 9263835ba6a81f693d2ceed5ae8f0a495e339ae7 Parents: 4c63c86 5979bce Author: Jonathan Ellis <[email protected]> Authored: Tue May 15 16:30:30 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue May 15 16:30:30 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 30 ++++++++++++--- .../cassandra/db/compaction/CompactionManager.java | 2 +- .../cassandra/db/compaction/CompactionTask.java | 4 +- 4 files changed, 28 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9263835b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 0d2ee5f,211314f..38c78f7 --- 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 + * calculate exact size required for cleanup operations (CASSANDRA-1404) * avoid blocking additional writes during flush when the commitlog gets behind temporarily (CASSANDRA-1991) * enable caching on index CFs based on data CF cache setting (CASSANDRA-4197) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9263835b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9263835b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9263835b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java ----------------------------------------------------------------------
