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/723792d6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/723792d6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/723792d6 Branch: refs/heads/trunk Commit: 723792d64961340945c4d2f28965da7b0e3eaa42 Parents: 3958a00 6b1fb2c Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Nov 19 18:27:15 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Nov 19 18:27:15 2013 +0100 ---------------------------------------------------------------------- .../apache/cassandra/locator/TokenMetadata.java | 22 +++++++++----- .../unit/org/apache/cassandra/db/ScrubTest.java | 4 +++ .../cassandra/locator/TokenMetadataTest.java | 30 ++++++++++---------- .../service/LeaveAndBootstrapTest.java | 6 ++++ 4 files changed, 40 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/723792d6/src/java/org/apache/cassandra/locator/TokenMetadata.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/723792d6/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java ----------------------------------------------------------------------
