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/bd601557 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd601557 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd601557 Branch: refs/heads/trunk Commit: bd6015572c351a4d63c6757ebf7d4b9865c3a8e1 Parents: 9967303 3355caf Author: Aleksey Yeschenko <[email protected]> Authored: Fri Sep 18 12:44:46 2015 +0100 Committer: Aleksey Yeschenko <[email protected]> Committed: Fri Sep 18 12:44:46 2015 +0100 ---------------------------------------------------------------------- .../locator/GossipingPropertyFileSnitch.java | 14 +++++++++----- .../apache/cassandra/locator/PropertyFileSnitch.java | 14 +++++++++----- .../org/apache/cassandra/locator/TokenMetadata.java | 2 ++ .../org/apache/cassandra/service/StorageService.java | 3 ++- 4 files changed, 22 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
