cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [12/12] git commit: Merge branch 'cassandra-2.1' into trunk
Date Fri, 05 Sep 2014 15:30:40 GMT
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();


Mime
View raw message