Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b5fb5737 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5fb5737 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b5fb5737 Branch: refs/heads/trunk Commit: b5fb5737a0c127584d945acb8f1322bf05dea69f Parents: 17e13e5 56965fd Author: Robert Stupp <[email protected]> Authored: Fri Nov 27 13:55:58 2015 +0100 Committer: Robert Stupp <[email protected]> Committed: Fri Nov 27 13:55:58 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/b5fb5737/CHANGES.txt ----------------------------------------------------------------------
