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/0fe80fb4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0fe80fb4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0fe80fb4 Branch: refs/heads/trunk Commit: 0fe80fb42390753625bebdafc6241172cb05b0a5 Parents: 5e933c5 736a0ce Author: Marcus Eriksson <marc...@apache.org> Authored: Mon Apr 4 14:04:09 2016 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Mon Apr 4 14:04:09 2016 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/repair/RepairJob.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
