Merge branch 'cassandra-2.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/c04d74f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c04d74f1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c04d74f1 Branch: refs/heads/trunk Commit: c04d74f1009f8cd93f563c2fde099b35f58dd941 Parents: 256da63 d869164 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Nov 20 21:01:17 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Nov 20 21:01:17 2013 -0600 ---------------------------------------------------------------------- .../apache/cassandra/service/PendingRangeCalculatorService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
