This is an automated email from the ASF dual-hosted git repository. marcuse pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from d75c438 Merge branch 'cassandra-3.11' into trunk new 98d81e4 Avoid NPE in fireErrorAndComplete and make sure we log the parentSessionId and exception new 0706d32 Dont try to interrupt index compactions when starting anticompactions. The 2 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 | 2 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 33 +++++++++---- .../cassandra/db/compaction/CompactionManager.java | 2 +- .../cassandra/db/repair/PendingAntiCompaction.java | 15 ++++-- .../org/apache/cassandra/repair/CommonRange.java | 6 +-- .../apache/cassandra/repair/RepairRunnable.java | 16 +++++-- .../db/compaction/CancelCompactionsTest.java | 56 +++++++++++++++++----- .../repair/AbstractPendingAntiCompactionTest.java | 14 +++++- .../db/repair/PendingAntiCompactionTest.java | 29 +++++++++++ 9 files changed, 137 insertions(+), 36 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org