Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5ad8010a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ad8010a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5ad8010a Branch: refs/heads/cassandra-3.0 Commit: 5ad8010a64d7176820b9be7cd46949eb710f9661 Parents: 1d7bacc 6ff1cbb Author: Sylvain Lebresne <[email protected]> Authored: Tue Jan 5 15:23:22 2016 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Jan 5 15:23:22 2016 +0100 ---------------------------------------------------------------------- .../apache/cassandra/locator/TokenMetadata.java | 61 ++++++++++---------- .../cassandra/service/StorageService.java | 2 +- 2 files changed, 32 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ad8010a/src/java/org/apache/cassandra/locator/TokenMetadata.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ad8010a/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
