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

Merge branch 'cassandra-3.0' into cassandra-3.X

This commit is contained in:
Jeff Jirsa 2016-10-21 19:04:04 -07:00
parent 575927b1e6 5883e43587
commit d4a914d216
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -140,6 +140,7 @@ Merged from 2.2:
* Forward writes to replacement node when replace_address != broadcast_address (CASSANDRA-8523)
* Fail repair on non-existing table (CASSANDRA-12279)
* Enable repair -pr and -local together (fix regression of CASSANDRA-7450) (CASSANDRA-12522)
* Split consistent range movement flag correction (CASSANDRA-12786)
Merged from 2.1:
* Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)

2
src/java/org/apache/cassandra/service/StorageService.java
View File

@ -874,7 +874,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
logger.debug("... got ring + schema info");
if (useStrictConsistency &&
if (useStrictConsistency && !allowSimultaneousMoves() &&
(
tokenMetadata.getBootstrapTokens().valueSet().size() > 0 ||
tokenMetadata.getLeavingEndpoints().size() > 0 ||