diff --git a/CHANGES.txt b/CHANGES.txt index 105791b4c3..b965262714 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -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) diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index 2e225d58ed..1475570cc8 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -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 ||