cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcken...@apache.org
Subject [20/22] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1
Date Wed, 11 Nov 2015 20:09:06 GMT
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/1fe90d34
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1fe90d34
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1fe90d34

Branch: refs/heads/cassandra-3.1
Commit: 1fe90d34bb7282df0b383289b13a9a190162ce4a
Parents: 6f7b389 9a90e98
Author: Joshua McKenzie <jmckenzie@apache.org>
Authored: Wed Nov 11 15:06:08 2015 -0500
Committer: Joshua McKenzie <jmckenzie@apache.org>
Committed: Wed Nov 11 15:06:08 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(-)
----------------------------------------------------------------------



Mime
View raw message