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/949c5dae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/949c5dae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/949c5dae Branch: refs/heads/trunk Commit: 949c5daea34d25487f42951df95d9a3ef5410fc7 Parents: ddd2ff7 b622411 Author: Brandon Williams <[email protected]> Authored: Mon May 5 11:49:34 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Mon May 5 11:49:34 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../service/ScheduledRangeTransferExecutorService.java | 6 +++--- src/java/org/apache/cassandra/service/StorageService.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/949c5dae/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/949c5dae/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
