merge from 1.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39b50156 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39b50156 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39b50156 Branch: refs/heads/trunk Commit: 39b501561849f4e4756e96f9dfb186030b375ece Parents: ae3d197 a043998 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Feb 27 13:42:57 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Feb 27 13:42:57 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 7 ++++++- .../apache/cassandra/db/HintedHandOffManager.java | 12 +----------- 2 files changed, 7 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/39b50156/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2cc8c52,640ff3f..e66ffe1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,6 +1,10 @@@ - 1.1-dev ++1.1.1-dev + * optimize commitlog checksumming (CASSANDRA-3610) ++ ++ + 1.1-dev + * start hint replay as soon as FD notifies that the target is back up + (CASSANDRA-3958) * avoid unproductive deserializing of cached rows during compaction (CASSANDRA-3921) * fix concurrency issues with CQL keyspace creation (CASSANDRA-3903)
