natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.2' into cassandra-3.0

This commit is contained in:
Jason Brown 2016-02-05 14:03:42 -08:00
parent 7a435c376c e4fb1deff7
commit 0663ebbd79
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -1,6 +1,7 @@
3.0.4
* Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001)
Merged from 2.2.6
* Gossiper#isEnabled is not thread safe (CASSANDRA-11116)
3.0.3
* Remove double initialization of newly added tables (CASSANDRA-11027)

2
src/java/org/apache/cassandra/gms/Gossiper.java
View File

@ -78,7 +78,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
SILENT_SHUTDOWN_STATES.add(VersionedValue.STATUS_BOOTSTRAPPING);
}
private ScheduledFuture<?> scheduledGossipTask;
private volatile ScheduledFuture<?> scheduledGossipTask;
private static final ReentrantLock taskLock = new ReentrantLock();
public final static int intervalInMillis = 1000;
public final static int QUARANTINE_DELAY = StorageService.RING_DELAY * 2;