cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jji...@apache.org
Subject [5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Date Thu, 02 Mar 2017 17:45:25 GMT
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 6f9610d4796a1592bf68e1755134a873a5b847d2
Parents: 943fb02 adbe2cc
Author: Jeff Jirsa <jeff@jeffjirsa.net>
Authored: Thu Mar 2 09:43:26 2017 -0800
Committer: Jeff Jirsa <jeff@jeffjirsa.net>
Committed: Thu Mar 2 09:43:49 2017 -0800

----------------------------------------------------------------------
 src/java/org/apache/cassandra/utils/StreamingHistogram.java      | 3 +--
 .../unit/org/apache/cassandra/db/compaction/CompactionsTest.java | 3 ++-
 .../db/compaction/DateTieredCompactionStrategyTest.java          | 4 ++--
 .../cassandra/db/compaction/LeveledCompactionStrategyTest.java   | 4 ++--
 .../db/compaction/SizeTieredCompactionStrategyTest.java          | 4 ++--
 test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java  | 4 ++--
 .../db/compaction/TimeWindowCompactionStrategyTest.java          | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f9610d4/src/java/org/apache/cassandra/utils/StreamingHistogram.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/utils/StreamingHistogram.java
index 6fde931,f1752a9..9114c7d
--- a/src/java/org/apache/cassandra/utils/StreamingHistogram.java
+++ b/src/java/org/apache/cassandra/utils/StreamingHistogram.java
@@@ -296,10 -271,9 +296,9 @@@ public class StreamingHistogra
              return false;
  
          StreamingHistogram that = (StreamingHistogram) o;
 -        return maxBinSize == that.maxBinSize
 -               && spool.equals(that.spool)
 -               && bin.equals(that.bin);
 +        return maxBinSize == that.maxBinSize &&
-                maxSpoolSize == that.maxSpoolSize &&
 +               spool.equals(that.spool) &&
 +               bin.equals(that.bin);
      }
  
      @Override

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f9610d4/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f9610d4/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f9610d4/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f9610d4/test/unit/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyTest.java
----------------------------------------------------------------------


Mime
View raw message