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/3355caf1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3355caf1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3355caf1 Branch: refs/heads/trunk Commit: 3355caf15388b8e964948d5dcdc26babaf4e3eb2 Parents: b99c863 32457e7 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Sep 18 12:43:16 2015 +0100 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Sep 18 12:43:16 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3355caf1/src/java/org/apache/cassandra/locator/TokenMetadata.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3355caf1/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
