Merge branch 'cassandra-2.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/23b02247 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23b02247 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23b02247 Branch: refs/heads/trunk Commit: 23b0224751b754bb35bffc47baa343e3463b50ba Parents: cae3cb2 b9d2684 Author: Jason Brown <[email protected]> Authored: Tue Jul 8 16:23:11 2014 -0700 Committer: Jason Brown <[email protected]> Committed: Tue Jul 8 16:23:11 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/ActiveRepairService.java | 22 +++++++++++--------- .../cassandra/service/StorageService.java | 5 ++++- 3 files changed, 17 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/23b02247/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/23b02247/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
