cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/9] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1
Date Fri, 16 Mar 2012 16:59:49 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/555b7380
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/555b7380
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/555b7380

Branch: refs/heads/trunk
Commit: 555b73808d0b95a5876733a7c4fa188f08b89283
Parents: aa40860 dfea120
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri Mar 16 11:59:00 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri Mar 16 11:59:00 2012 -0500

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 +
 .../org/apache/cassandra/db/ColumnFamilyStore.java |   93 ++++----------
 .../apache/cassandra/io/sstable/SSTableWriter.java |    7 +-
 test/unit/org/apache/cassandra/CleanupHelper.java  |    8 +-
 4 files changed, 42 insertions(+), 68 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/555b7380/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0030df5,3053bb3..da98a93
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,6 +1,12 @@@
 +1.1.1-dev
 + * optimize commitlog checksumming (CASSANDRA-3610)
 + * identify and blacklist corrupted SSTables from future compactions (CASSANDRA-2261)
 + * fix KEYS index from skipping results (CASSANDRA-3996)
 +
 +
  1.1-dev
+  * rename loaded sstables to avoid conflicts with local snapshots
+    (CASSANDRA-3967)
   * start hint replay as soon as FD notifies that the target is back up
     (CASSANDRA-3958)
   * avoid unproductive deserializing of cached rows during compaction

http://git-wip-us.apache.org/repos/asf/cassandra/blob/555b7380/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------


Mime
View raw message