cassandra git commit: Make it possible to run dc local repairs

2015-06-02 Thread marcuse
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 4cfb17f48 - b2e4d1015


Make it possible to run dc local repairs

Patch by marcuse; reviewed by yukim for CASSANDRA-9521


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

Branch: refs/heads/cassandra-2.2
Commit: b2e4d10155afa3618ba1a9066c6ffc13489c73d8
Parents: 4cfb17f
Author: Marcus Eriksson marc...@apache.org
Authored: Tue Jun 2 17:36:42 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Tue Jun 2 17:36:42 2015 +0200

--
 src/java/org/apache/cassandra/service/StorageService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2e4d101/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 8afb93f..4fdb7b7 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2966,7 +2966,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 private FutureTaskObject createRepairTask(final int cmd, final String 
keyspace, final RepairOption options)
 {
-if (!options.getDataCenters().isEmpty()  
options.getDataCenters().contains(DatabaseDescriptor.getLocalDataCenter()))
+if (!options.getDataCenters().isEmpty()  
!options.getDataCenters().contains(DatabaseDescriptor.getLocalDataCenter()))
 {
 throw new IllegalArgumentException(the local data center must be 
part of the repair);
 }



[1/2] cassandra git commit: Make it possible to run dc local repairs

2015-06-02 Thread marcuse
Repository: cassandra
Updated Branches:
  refs/heads/trunk e27e97413 - bde7615c2


Make it possible to run dc local repairs

Patch by marcuse; reviewed by yukim for CASSANDRA-9521


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

Branch: refs/heads/trunk
Commit: b2e4d10155afa3618ba1a9066c6ffc13489c73d8
Parents: 4cfb17f
Author: Marcus Eriksson marc...@apache.org
Authored: Tue Jun 2 17:36:42 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Tue Jun 2 17:36:42 2015 +0200

--
 src/java/org/apache/cassandra/service/StorageService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2e4d101/src/java/org/apache/cassandra/service/StorageService.java
--
diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index 8afb93f..4fdb7b7 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2966,7 +2966,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 
 private FutureTaskObject createRepairTask(final int cmd, final String 
keyspace, final RepairOption options)
 {
-if (!options.getDataCenters().isEmpty()  
options.getDataCenters().contains(DatabaseDescriptor.getLocalDataCenter()))
+if (!options.getDataCenters().isEmpty()  
!options.getDataCenters().contains(DatabaseDescriptor.getLocalDataCenter()))
 {
 throw new IllegalArgumentException(the local data center must be 
part of the repair);
 }