Merge branch 'cassandra-3.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/f3ff8df0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3ff8df0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f3ff8df0 Branch: refs/heads/trunk Commit: f3ff8df0543e24284806908e3861189b4c28e92a Parents: 48da81d 8134f09 Author: Aleksey Yeschenko <[email protected]> Authored: Wed Sep 16 12:05:22 2015 +0100 Committer: Aleksey Yeschenko <[email protected]> Committed: Wed Sep 16 12:05:22 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../locator/GossipingPropertyFileSnitch.java | 1 + .../cassandra/locator/PropertyFileSnitch.java | 1 + .../apache/cassandra/locator/TokenMetadata.java | 142 ++++++++++--- .../cassandra/service/StorageService.java | 16 ++ .../cassandra/locator/TokenMetadataTest.java | 213 ++++++++++++++++++- 6 files changed, 335 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3ff8df0/CHANGES.txt ----------------------------------------------------------------------
