Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d30c30bb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d30c30bb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d30c30bb Branch: refs/heads/trunk Commit: d30c30bb90d398e520d597c4001bbf1d8f332d1c Parents: 5146463 4ee374a Author: Yuki Morishita <[email protected]> Authored: Wed Dec 2 08:54:26 2015 -0600 Committer: Yuki Morishita <[email protected]> Committed: Wed Dec 2 08:54:26 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/d30c30bb/CHANGES.txt ----------------------------------------------------------------------
