Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/33e7bba1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33e7bba1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33e7bba1 Branch: refs/heads/trunk Commit: 33e7bba126c9d7cd0555448cc49b56119bef06d6 Parents: d00d091 b5fb573 Author: Robert Stupp <sn...@snazy.de> Authored: Fri Nov 27 13:57:12 2015 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Fri Nov 27 13:57:12 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 6 + src/java/org/apache/cassandra/gms/Gossiper.java | 28 +- .../locator/GossipingPropertyFileSnitch.java | 107 ++---- .../cassandra/locator/PropertyFileSnitch.java | 74 +++- .../cassandra/locator/SnitchProperties.java | 5 + .../cassandra/service/CassandraDaemon.java | 17 +- .../cassandra/service/MigrationManager.java | 4 +- .../apache/cassandra/service/StorageProxy.java | 8 +- .../cassandra/service/StorageService.java | 28 +- .../GossipingPropertyFileSnitchTest.java | 35 +- .../locator/PropertyFileSnitchTest.java | 334 +++++++++++++++++++ 12 files changed, 493 insertions(+), 154 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/33e7bba1/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/33e7bba1/NEWS.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/33e7bba1/src/java/org/apache/cassandra/service/CassandraDaemon.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/33e7bba1/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
