Merge branch 'cassandra-1.1' into trunk
Conflicts:
src/java/org/apache/cassandra/db/compaction/CompactionManager.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9af3b023
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9af3b023
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9af3b023
Branch: refs/heads/cassandra-1.1
Commit: 9af3b023ee9d6e0f787339e05887a21209eafabc
Parents: dc071e7 ccd436c
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Fri Jul 27 10:36:40 2012 +0200
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Fri Jul 27 10:36:40 2012 +0200
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../cassandra/db/compaction/CompactionManager.java | 11 ++++++-----
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9af3b023/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9af3b023/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index be101bf,0f5be39..06ca1a2
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -856,9 -851,11 +859,7 @@@ public class CompactionManager implemen
{
public ValidationCompactionController(ColumnFamilyStore cfs,
Collection<SSTableReader> sstables)
{
-- super(cfs,
- Integer.MAX_VALUE,
- null);
- NO_GC,
- true,
- null,
-
cfs.getCompactionStrategy().isKeyExistenceExpensive(ImmutableSet.copyOf(sstables)));
++ super(cfs, NO_GC, null);
}
@Override
