This is an automated email from the ASF dual-hosted git repository.
bdeggleston pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 79766f7 Merge branch 'cassandra-3.11' into trunk
new c3ce32e Fix assorted gossip races and add related runtime checks
new 01d6548 Merge branch 'cassandra-3.0' into cassandra-3.11
new 587961a Merge branch 'cassandra-3.11' into trunk
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 +
build.xml | 1 +
ide/idea/workspace.xml | 2 +-
.../cassandra/config/DatabaseDescriptor.java | 8 +
src/java/org/apache/cassandra/gms/Gossiper.java | 201 ++++++++++++++-------
.../apache/cassandra/service/StorageService.java | 10 +-
.../cassandra/distributed/impl/Instance.java | 26 +--
.../org/apache/cassandra/gms/GossiperTest.java | 1 +
.../gms/PendingRangeCalculatorServiceTest.java | 1 +
.../cassandra/locator/CloudstackSnitchTest.java | 1 +
.../apache/cassandra/locator/EC2SnitchTest.java | 1 +
.../cassandra/locator/GoogleCloudSnitchTest.java | 1 +
.../cassandra/locator/PropertyFileSnitchTest.java | 1 +
.../net/StartupClusterConnectivityCheckerTest.java | 2 +-
.../service/StorageServiceServerTest.java | 1 +
15 files changed, 179 insertions(+), 79 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
