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/6645062c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6645062c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6645062c Branch: refs/heads/trunk Commit: 6645062caaebfa7d77ae0c77db9e33cd1be44005 Parents: 0010fce 798a7a8 Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Nov 17 10:15:58 2015 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Nov 17 10:15:58 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/6645062c/CHANGES.txt ----------------------------------------------------------------------
