You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2014/11/13 19:56:10 UTC
[3/4] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/service/ActiveRepairService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f4456a27
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4456a27
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f4456a27
Branch: refs/heads/trunk
Commit: f4456a27c30e320cd92ff1984906f134147e719b
Parents: 9c66482 feb2675
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Nov 13 12:48:17 2014 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Nov 13 12:48:17 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/repair/RepairMessageVerbHandler.java | 4 ++++
src/java/org/apache/cassandra/service/ActiveRepairService.java | 5 +++++
3 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4456a27/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4456a27/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4456a27/src/java/org/apache/cassandra/service/ActiveRepairService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/ActiveRepairService.java
index 171b1c7,68c2fae..763ecdf
--- a/src/java/org/apache/cassandra/service/ActiveRepairService.java
+++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java
@@@ -311,7 -343,12 +311,12 @@@ public class ActiveRepairServic
return parentRepairSessions.get(parentSessionId);
}
+ public ParentRepairSession removeParentRepairSession(UUID parentSessionId)
+ {
+ return parentRepairSessions.remove(parentSessionId);
+ }
+
- public List<Future<?>> doAntiCompaction(UUID parentRepairSession) throws InterruptedException, ExecutionException, IOException
+ public List<Future<?>> doAntiCompaction(UUID parentRepairSession)
{
assert parentRepairSession != null;
ParentRepairSession prs = getParentRepairSession(parentRepairSession);