cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/10] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1
Date Wed, 29 Feb 2012 03:16:00 GMT
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/087aa315
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/087aa315
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/087aa315

Branch: refs/heads/trunk
Commit: 087aa3158a19d1e4119bf044ce4db827afede6d9
Parents: 9483e14 bd9e402
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Feb 28 21:15:21 2012 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Feb 28 21:15:21 2012 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 +
 .../cassandra/db/ColumnFamilySerializer.java       |    2 +-
 .../apache/cassandra/db/HintedHandOffManager.java  |   18 +++++++-
 .../cassandra/db/UnknownColumnFamilyException.java |   33 +++++++++++++++
 .../db/UnserializableColumnFamilyException.java    |   33 ---------------
 .../apache/cassandra/db/commitlog/CommitLog.java   |    2 +-
 6 files changed, 52 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/087aa315/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 591ae9f,b6f1447..db87e4b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -26,9 -21,10 +26,11 @@@ Merged from 1.0
   * (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)
+  * delete hints from dropped ColumnFamilies on handoff instead of
+    erroring out (CASSANDRA-3975)
  
  
 +
  1.1-beta1
   * add nodetool rebuild_index (CASSANDRA-3583)
   * add nodetool rangekeysample (CASSANDRA-2917)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/087aa315/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
----------------------------------------------------------------------


Mime
View raw message