Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/72464ec2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/72464ec2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/72464ec2 Branch: refs/heads/trunk Commit: 72464ec2f749d0867df4b10afb6c76b9e91fff6c Parents: 5dc53e9 0bb3a8d Author: Sylvain Lebresne <[email protected]> Authored: Tue Jan 5 15:25:19 2016 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Jan 5 15:25:19 2016 +0100 ---------------------------------------------------------------------- .../apache/cassandra/locator/TokenMetadata.java | 61 ++++++++++---------- .../cassandra/service/StorageService.java | 2 +- 2 files changed, 32 insertions(+), 31 deletions(-) ----------------------------------------------------------------------
