Updated Branches: refs/heads/cassandra-1.1 33f1bacbf -> a4fab90af refs/heads/trunk aa267059c -> 15577ba86
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/15577ba8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15577ba8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15577ba8 Branch: refs/heads/trunk Commit: 15577ba86b4615e25611245e019b07304576f751 Parents: aa26705 a4fab90 Author: Jonathan Ellis <[email protected]> Authored: Thu Jun 14 17:40:23 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Jun 14 17:40:23 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/compaction/LeveledManifest.java | 71 +++++++++++---- 2 files changed, 55 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/15577ba8/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 25993ff,b0e667d..b7d4861 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,26 -1,5 +1,27 @@@ +1.2-dev + * multithreaded hint replay (CASSANDRA-4189) + * add inter-node message compression (CASSANDRA-3127) + * enforce 1m min keycache for auto (CASSANDRA-4306) + * remove COPP (CASSANDRA-2479) + * 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) + * Avoid ID conflicts from concurrent schema changes (CASSANDRA-3794) + * Set thrift HSHA server thread limit to unlimet by default (CASSANDRA-4277) + * Avoids double serialization of CF id in RowMutation messages + (CASSANDRA-4293) + * fix Summary component and caches to use correct partitioner (CASSANDRA-4289) + * stream compressed sstables directly with java nio (CASSANDRA-4297) + + 1.1.2 + * LCS no longer promotes tiny sstables out of L0 (CASSANDRA-4341) * skip tombstones during hint replay (CASSANDRA-4320) * fix NPE in compactionstats (CASSANDRA-4318) * enforce 1m min keycache for auto (CASSANDRA-4306) http://git-wip-us.apache.org/repos/asf/cassandra/blob/15577ba8/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ----------------------------------------------------------------------
