Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aabad85f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aabad85f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aabad85f Branch: refs/heads/trunk Commit: aabad85fb2f48f4f8afcb62ea003e9fc7be887cb Parents: 34910c5 f490cce Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Aug 25 19:06:57 2015 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Aug 25 19:06:57 2015 +0200 ---------------------------------------------------------------------- .../repair/RepairMessageVerbHandler.java | 5 +- .../apache/cassandra/repair/RepairRunnable.java | 2 +- .../repair/messages/PrepareMessage.java | 10 +++- .../cassandra/repair/messages/RepairOption.java | 4 ++ .../cassandra/service/ActiveRepairService.java | 49 +++++++++++++------- .../LeveledCompactionStrategyTest.java | 2 +- .../cassandra/repair/LocalSyncTaskTest.java | 2 +- 7 files changed, 51 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
