Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/110e803e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/110e803e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/110e803e Branch: refs/heads/trunk Commit: 110e803edd877de7ce3bf457430b197e0d214b83 Parents: 6cad04b 13172bd Author: Yuki Morishita <[email protected]> Authored: Wed Aug 19 19:02:21 2015 -0500 Committer: Yuki Morishita <[email protected]> Committed: Wed Aug 19 19:02:21 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/repair/RepairMessageVerbHandler.java | 3 ++- .../apache/cassandra/repair/messages/PrepareMessage.java | 10 ++++++++-- .../org/apache/cassandra/service/ActiveRepairService.java | 9 +++++---- .../db/compaction/LeveledCompactionStrategyTest.java | 2 +- .../org/apache/cassandra/repair/LocalSyncTaskTest.java | 2 +- 6 files changed, 18 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/110e803e/CHANGES.txt ----------------------------------------------------------------------
