You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/02/24 17:46:48 UTC
[2/9] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1
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/d65590ac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d65590ac
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d65590ac
Branch: refs/heads/cassandra-1.1
Commit: d65590ac8a5a3cfbe1529ef77346e84d6961db7d
Parents: a62800d 7587e73
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Feb 24 10:46:20 2012 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Feb 24 10:46:20 2012 -0600
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../apache/cassandra/db/HintedHandOffManager.java | 23 +++++++++-----
2 files changed, 17 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d65590ac/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d7ace7b,d7babd6..c8ccc24
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -16,9 -14,9 +16,10 @@@ Merged from 1.0
* (cqlsh) ignore missing CfDef opts (CASSANDRA-3933)
* (cqlsh) look for cqlshlib relative to realpath (CASSANDRA-3767)
* Fix short read protection (CASSANDRA-3934)
+ * always compact away deleted hints immediately after handoff (CASSANDRA-3955)
+
1.1-beta1
* add nodetool rebuild_index (CASSANDRA-3583)
* add nodetool rangekeysample (CASSANDRA-2917)