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/7d6dbf89 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d6dbf89 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d6dbf89 Branch: refs/heads/trunk Commit: 7d6dbf897cd14e6c5811a0588f25e5c11385a9fd Parents: 55811e5 1fe90d3 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Wed Nov 11 15:06:23 2015 -0500 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Wed Nov 11 15:06:23 2015 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/gms/EndpointState.java | 76 ++++++--- .../apache/cassandra/gms/FailureDetector.java | 7 +- src/java/org/apache/cassandra/gms/Gossiper.java | 47 +++--- .../apache/cassandra/gms/VersionedValue.java | 5 + .../cassandra/service/StorageService.java | 61 ++++--- .../apache/cassandra/gms/EndpointStateTest.java | 159 +++++++++++++++++++ .../cassandra/locator/CloudstackSnitchTest.java | 4 +- .../apache/cassandra/locator/EC2SnitchTest.java | 4 +- .../locator/GoogleCloudSnitchTest.java | 4 +- 9 files changed, 282 insertions(+), 85 deletions(-) ----------------------------------------------------------------------
