This is an automated email from the ASF dual-hosted git repository.
spod pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 220611a6a827989fdac92e9fd8b0a647cd5673b5
Merge: fd47391 c94a6aa
Author: Stefan Podkowinski <s.podkowin...@gmail.com>
AuthorDate: Mon Feb 4 16:28:09 2019 +0100
Merge branch 'cassandra-3.0' into cassandra-3.11
CHANGES.txt | 5 +++++
.../concurrent/AbstractLocalAwareExecutorService.java | 12 ++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --cc CHANGES.txt
index 76cd7d7,a7e35ea..4608278
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,8 +1,12 @@@
-3.0.19
++3.11.5
++Merged from 3.0:
+ * Catch CorruptSSTableExceptions and FSErrors in ALAExecutorService
(CASSANDRA-14993)
+
+
-3.0.18
+3.11.4
+ * Make stop-server.bat wait for Cassandra to terminate (CASSANDRA-14829)
+ * Correct sstable sorting for garbagecollect and levelled compaction
(CASSANDRA-14870)
+Merged from 3.0:
* Severe concurrency issues in STCS,DTCS,TWCS,TMD.Topology,TypeParser
* Add a script to make running the cqlsh tests in cassandra repo easier
(CASSANDRA-14951)
* If SizeEstimatesRecorder misses a 'onDropTable' notification, the
size_estimates table will never be cleared for that table. (CASSANDRA-14905)
diff --cc
src/java/org/apache/cassandra/concurrent/AbstractLocalAwareExecutorService.java
index 530f46e,a2193f2..4b1fe05
---
a/src/java/org/apache/cassandra/concurrent/AbstractLocalAwareExecutorService.java
+++
b/src/java/org/apache/cassandra/concurrent/AbstractLocalAwareExecutorService.java
@@@ -29,6 -29,11 +29,9 @@@ import java.util.concurrent.TimeoutExce
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+ import org.apache.cassandra.io.FSError;
+ import org.apache.cassandra.io.sstable.CorruptSSTableException;
+ import org.apache.cassandra.io.util.FileUtils;
-import org.apache.cassandra.tracing.TraceState;
-import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.utils.concurrent.SimpleCondition;
import org.apache.cassandra.utils.JVMStabilityInspector;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
