Merge branch 'cassandra-3.5' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fafbf27f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fafbf27f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fafbf27f Branch: refs/heads/trunk Commit: fafbf27fd629bf9474e406ec636dea4e6d9c76fc Parents: d00bda8 cd69d9d Author: Marcus Eriksson <marc...@apache.org> Authored: Thu Mar 31 09:46:02 2016 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Thu Mar 31 09:46:02 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java | 17 ++++++++++------- .../repair/RepairMessageVerbHandler.java | 18 ++++++++++-------- .../cassandra/service/ActiveRepairService.java | 2 +- 4 files changed, 22 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fafbf27f/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fafbf27f/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ----------------------------------------------------------------------
