Updated Branches: refs/heads/cassandra-1.0 c73881309 -> f08051194 refs/heads/cassandra-1.1 3f8372c1f -> 211bc0ca3 refs/heads/trunk 95c105ba2 -> 3699a2de0
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/3699a2de Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3699a2de Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3699a2de Branch: refs/heads/trunk Commit: 3699a2de039e6ae56ac1c74640cb4d5abefbe3a1 Parents: 95c105b 211bc0c Author: Jonathan Ellis <[email protected]> Authored: Mon Apr 16 15:45:47 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Apr 16 15:45:47 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 55 ++++++++++++--- .../cassandra/db/compaction/CompactionManager.java | 7 ++ .../org/apache/cassandra/dht/AbstractBounds.java | 11 +++ src/java/org/apache/cassandra/dht/Range.java | 33 +++++++-- 5 files changed, 90 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3699a2de/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 3cfd92e,1b8377a..7691db6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,6 +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) + + 1.1.1-dev + * optimize cleanup to drop entire sstables where possible (CASSANDRA-4079) + * optimize truncate when autosnapshot is disabled (CASSANDRA-4153) * add support for commitlog archiving and point-in-time recovery (CASSANDRA-3647) * update caches to use byte[] keys to reduce memory overhead (CASSANDRA-3966) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3699a2de/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3699a2de/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3699a2de/src/java/org/apache/cassandra/dht/AbstractBounds.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3699a2de/src/java/org/apache/cassandra/dht/Range.java ----------------------------------------------------------------------
