Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/service/StorageServiceMBean.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/108260f1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/108260f1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/108260f1
Branch: refs/heads/trunk
Commit: 108260f110367846ad62bfeeece3c16d99cf95cf
Parents: 93ebff3 c86fc85
Author: Robert Stupp <sn...@snazy.de>
Authored: Wed Feb 18 22:03:38 2015 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed Feb 18 22:03:38 2015 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageServiceMBean.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/108260f1/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageServiceMBean.java
index 06ab56a,c7013c3..c533618
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@@ -259,15 -268,10 +259,15 @@@ public interface StorageServiceMBean ex
* You can track repair progress by subscribing JMX notification sent
from this StorageServiceMBean.
* Notification format is:
* type: "repair"
- * userObject: int array of length 2, [0]=command number, [1]=ordinal
of AntiEntropyService.Status
+ * userObject: int array of length 2, [0]=command number, [1]=ordinal
of ActiveRepairService.Status
*
+ * @param keyspace Keyspace name to repair. Should not be null.
+ * @param options repair option.
* @return Repair command number, or 0 if nothing to repair
*/
+ public int repairAsync(String keyspace, Map<String, String> options);
+
+ @Deprecated
public int forceRepairAsync(String keyspace, boolean isSequential,
Collection<String> dataCenters, Collection<String> hosts, boolean
primaryRange, boolean repairedAt, String... columnFamilies) throws IOException;
/**
