cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject git commit: fix bad automatic merge
Date Sat, 13 Apr 2013 04:16:43 GMT
Updated Branches:
  refs/heads/cassandra-1.2 95ff3bb5b -> 260dc757f


fix bad automatic merge


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

Branch: refs/heads/cassandra-1.2
Commit: 260dc757fc9da97cc5005def87bf8eefd2cd92e2
Parents: 95ff3bb
Author: Dave Brosius <dbrosius@apache.org>
Authored: Sat Apr 13 00:16:22 2013 -0400
Committer: Dave Brosius <dbrosius@apache.org>
Committed: Sat Apr 13 00:16:22 2013 -0400

----------------------------------------------------------------------
 .../db/compaction/LeveledCompactionStrategy.java   |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/260dc757/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
index b6da891..9a73299 100644
--- a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
+++ b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
@@ -44,8 +44,6 @@ public class LeveledCompactionStrategy extends AbstractCompactionStrategy
implem
     private static final Logger logger = LoggerFactory.getLogger(LeveledCompactionStrategy.class);
     private static final String SSTABLE_SIZE_OPTION = "sstable_size_in_mb";
 
-    private static final String SSTABLE_SIZE_OPTION = "sstable_size_in_mb";
-
     @VisibleForTesting
     final LeveledManifest manifest;
     private final int maxSSTableSizeInMB;


Mime
View raw message