cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [4/4] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Date Mon, 03 Aug 2015 12:54:29 GMT
Merge branch 'cassandra-2.2' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a7cc419b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7cc419b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7cc419b

Branch: refs/heads/trunk
Commit: a7cc419bbc4f36f97f2fae59c38f060dbe3f676a
Parents: 4d39d4d 925e620
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Mon Aug 3 14:52:53 2015 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Mon Aug 3 14:52:53 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 .../org/apache/cassandra/db/compaction/CompactionManager.java  | 6 +++---
 src/java/org/apache/cassandra/db/compaction/Scrubber.java      | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7cc419b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 3dee7b7,401f426..4b4f908
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -53,8 -26,9 +53,9 @@@ Merged from 2.1
   * Handle corrupt files on startup (CASSANDRA-9686)
   * Fix clientutil jar and tests (CASSANDRA-9760)
   * (cqlsh) Allow the SSL protocol version to be specified through the
 -   config file or environment variables (CASSANDRA-9544)
 +    config file or environment variables (CASSANDRA-9544)
  Merged from 2.0:
+  * Don't cast expected bf size to an int (CASSANDRA-9959)
   * checkForEndpointCollision fails for legitimate collisions (CASSANDRA-9765)
   * Complete CASSANDRA-8448 fix (CASSANDRA-9519)
   * Don't include auth credentials in debug log (CASSANDRA-9682)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7cc419b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 548c661,5bac084..fc0acff
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -949,10 -966,9 +949,10 @@@ public class CompactionManager implemen
  
      public static SSTableWriter createWriter(ColumnFamilyStore cfs,
                                               File compactionFileLocation,
-                                              int expectedBloomFilterSize,
+                                              long expectedBloomFilterSize,
                                               long repairedAt,
 -                                             SSTableReader sstable)
 +                                             SSTableReader sstable,
 +                                             LifecycleTransaction txn)
      {
          FileUtils.createDirectory(compactionFileLocation);
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7cc419b/src/java/org/apache/cassandra/db/compaction/Scrubber.java
----------------------------------------------------------------------


Mime
View raw message