Updated Branches: refs/heads/cassandra-1.1 89e7a5742 -> 39dd85501 refs/heads/trunk f211e507b -> 9bf0386b6
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9bf0386b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9bf0386b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9bf0386b Branch: refs/heads/trunk Commit: 9bf0386b6ba16f23cab001290f45dce387b87e83 Parents: 4a3fa3c 39dd855 Author: Jonathan Ellis <jbel...@apache.org> Authored: Sat May 19 17:34:29 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Sat May 19 17:34:29 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/io/sstable/SSTableReader.java | 4 ++-- .../cassandra/streaming/StreamInSession.java | 10 +++++----- 3 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bf0386b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d851369,6a00d41..bb4bbe5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,5 +1,16 @@@ +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) + + 1.1.1-dev + * (Hadoop) fix split generation regression (CASSANDRA-4259) * ignore min/max compactions settings in LCS, while preserving behavior that min=max=0 disables autocompaction (CASSANDRA-4233) * log number of rows read from saved cache (CASSANDRA-4249) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bf0386b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bf0386b/src/java/org/apache/cassandra/streaming/StreamInSession.java ----------------------------------------------------------------------
