[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk

[sn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

snazy pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 5ea3394e9561591322356b19f41ef450fe1972ab
Merge: ef6c5f8 737a566
Author: Robert Stupp <sn...@snazy.de>
AuthorDate: Fri Feb 1 12:34:56 2019 +0100

    Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --cc CHANGES.txt
index a905ad3,76cd7d7..4f52cca
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -348,10 -2,13 +348,11 @@@
   * 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)
 - * Counters fail to increment in 2.1/2.2 to 3.X mixed version clusters (CASSANDRA-14958)
   * Streaming needs to synchronise access to LifecycleTransaction (CASSANDRA-14554)
   * Fix cassandra-stress write hang with default options (CASSANDRA-14616)
 - * Differentiate between slices and RTs when decoding legacy bounds (CASSANDRA-14919)
   * Netty epoll IOExceptions caused by unclean client disconnects being logged at INFO (CASSANDRA-14909)
   * Unfiltered.isEmpty conflicts with Row extends AbstractCollection.isEmpty (CASSANDRA-14588)
   * RangeTombstoneList doesn't properly clean up mergeable or superseded rts in some cases (CASSANDRA-14894)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org