You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sc...@apache.org on 2012/03/06 07:07:23 UTC
[1/2] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1
Updated Branches:
refs/heads/cassandra-1.1 fb7dfc914 -> 9418c2a2f
Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9418c2a2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9418c2a2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9418c2a2
Branch: refs/heads/cassandra-1.1
Commit: 9418c2a2fee018b6d9ed05bcd510050441fc1e0f
Parents: fb7dfc9 154daa0
Author: Peter Schuller <pe...@infidyne.com>
Authored: Mon Mar 5 22:06:19 2012 -0800
Committer: Peter Schuller <pe...@infidyne.com>
Committed: Mon Mar 5 22:06:19 2012 -0800
----------------------------------------------------------------------
CHANGES.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9418c2a2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 42bf195,86ab50a..75123a8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,3 +1,8 @@@
+1.1.1-dev
+ * optimize commitlog checksumming (CASSANDRA-3610)
+ * identify and blacklist corrupted SSTables from future compactions (CASSANDRA-2261)
- * expose counters for unavailable/timeout exceptions given to thrift clients (CASSANDRA-3671)
+
+
1.1-dev
* start hint replay as soon as FD notifies that the target is back up
(CASSANDRA-3958)