Return-Path: 
 <commits-return-57755-apmail-cassandra-commits-archive=cassandra.apache.org@cassandra.apache.org>
X-Original-To: apmail-cassandra-commits-archive@www.apache.org
Delivered-To: apmail-cassandra-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 702A6D401
	for <apmail-cassandra-commits-archive@www.apache.org>;
 Fri, 27 Jul 2012 15:19:40 +0000 (UTC)
Received: (qmail 88936 invoked by uid 500); 27 Jul 2012 15:19:39 -0000
Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org
Received: (qmail 88857 invoked by uid 500); 27 Jul 2012 15:19:38 -0000
Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cassandra.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cassandra.apache.org>
List-Post: <mailto:commits@cassandra.apache.org>
List-Id: <commits.cassandra.apache.org>
Reply-To: dev@cassandra.apache.org
Delivered-To: mailing list commits@cassandra.apache.org
Received: (qmail 88631 invoked by uid 99); 27 Jul 2012 15:19:38 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Jul 2012 15:19:38 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 83BA6195FA; Fri, 27 Jul 2012 15:19:38 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: yukim@apache.org
To: commits@cassandra.apache.org
X-Mailer: ASF-Git Admin Mailer
Subject: [3/50] [abbrv] git commit: Merge branch 'cassandra-1.1' into trunk
Message-Id: <20120727151938.83BA6195FA@tyr.zones.apache.org>
Date: Fri, 27 Jul 2012 15:19:38 +0000 (UTC)

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 <sylvain@datastax.com>
Authored: Fri Jul 27 10:36:40 2012 +0200
Committer: Sylvain Lebresne <sylvain@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