Return-Path: 
 <commits-return-111159-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 CB233113C6
	for <apmail-cassandra-commits-archive@www.apache.org>;
 Fri,  5 Sep 2014 15:30:38 +0000 (UTC)
Received: (qmail 76333 invoked by uid 500); 5 Sep 2014 15:30:30 -0000
Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org
Received: (qmail 76254 invoked by uid 500); 5 Sep 2014 15:30:30 -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 75927 invoked by uid 99); 5 Sep 2014 15:30:30 -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, 05 Sep 2014 15:30:30 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id A308EA0A569; Fri,  5 Sep 2014 15:30:29 +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
Date: Fri, 05 Sep 2014 15:30:40 -0000
Message-Id: <1e780eb16a9f43babe53d351aa964db6@git.apache.org>
In-Reply-To: <8491e1a4fce244d58c85dfd21bec3f35@git.apache.org>
References: <8491e1a4fce244d58c85dfd21bec3f35@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [12/12] git commit: Merge branch 'cassandra-2.1' into trunk

Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: fbc0f447d17ba9237ed2f28101b8b0ae1b21b80d
Parents: 33cedda 7d84043
Author: Yuki Morishita <yukim@apache.org>
Authored: Fri Sep 5 10:29:56 2014 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Fri Sep 5 10:29:56 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                               | 1 +
 src/java/org/apache/cassandra/service/StorageService.java | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbc0f447/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbc0f447/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 7575936,fb4e6e6..6714be6
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -2496,9 -2496,9 +2496,9 @@@ public class StorageService extends Not
          return forceRepairAsync(keyspace, isSequential, isLocal, ranges, fullRepair, columnFamilies);
      }
  
 -    public int forceRepairAsync(String keyspace, boolean isSequential, boolean isLocal, Collection<Range<Token>> ranges, boolean fullRepair, String... columnFamilies)
 +    public int forceRepairAsync(final String keyspace, final boolean isSequential, final boolean isLocal, final Collection<Range<Token>> ranges, final boolean fullRepair, final String... columnFamilies)
      {
-         if (Keyspace.SYSTEM_KS.equals(keyspace) || ranges.isEmpty())
+         if (ranges.isEmpty() || Keyspace.open(keyspace).getReplicationStrategy().getReplicationFactor() < 2)
              return 0;
  
          int cmd = nextRepairCommand.incrementAndGet();