Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4ee374ab Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4ee374ab Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4ee374ab Branch: refs/heads/cassandra-3.1 Commit: 4ee374ab36431cdaa071abf99cd4c4501afbf57f Parents: b97fa11 e00e32e Author: Yuki Morishita <yu...@apache.org> Authored: Wed Dec 2 08:53:17 2015 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Wed Dec 2 08:53:17 2015 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/repair/AnticompactionTask.java | 23 ++++++++++++++------ .../cassandra/service/ActiveRepairService.java | 15 ++++++++++--- 3 files changed, 29 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ee374ab/CHANGES.txt ----------------------------------------------------------------------
