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/67ed3375 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67ed3375 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/67ed3375 Branch: refs/heads/trunk Commit: 67ed3375b26286a1c767644283374e784df4563f Parents: e48a00b 773b95e Author: Dave Brosius <[email protected]> Authored: Wed May 7 21:23:38 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Wed May 7 21:23:38 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- .../cassandra/service/PendingRangeCalculatorService.java | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/67ed3375/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/67ed3375/src/java/org/apache/cassandra/service/PendingRangeCalculatorService.java ----------------------------------------------------------------------
