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/798a7a8f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/798a7a8f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/798a7a8f Branch: refs/heads/cassandra-3.1 Commit: 798a7a8fe8e7f28605341ebabc538908c3ff8dba Parents: 36e7677 eb8afb7 Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Nov 17 10:13:33 2015 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Nov 17 10:13:33 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../cassandra/repair/messages/RepairOption.java | 18 +++++++++++++++--- .../cassandra/service/ActiveRepairService.java | 2 ++ .../apache/cassandra/service/StorageService.java | 9 +++++++-- .../repair/messages/RepairOptionTest.java | 17 +++++++++++++++-- 5 files changed, 41 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/798a7a8f/CHANGES.txt ----------------------------------------------------------------------
