This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 6912d32b7dfccba81118e12b920f010e060c2941
Merge: 4654ef0 9b165c9
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Tue Jul 7 12:34:49 2020 +0200
Merge branch 'cassandra-3.11' into trunk
CHANGES.txt | 1 +
.../cassandra/utils/memory/NativeAllocator.java | 33 ++++++----------------
.../cassandra/utils/memory/SlabAllocator.java | 31 ++++++--------------
3 files changed, 18 insertions(+), 47 deletions(-)
diff --cc CHANGES.txt
index 76cd271,72c05ff..d382650
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -55,7 -2,9 +55,8 @@@ Merged from 3.11
* Fix cqlsh output when fetching all rows in batch mode (CASSANDRA-15905)
* Upgrade Jackson to 2.9.10 (CASSANDRA-15867)
* Fix CQL formatting of read command restrictions for slow query log
(CASSANDRA-15503)
- * Allow sstableloader to use SSL on the native port (CASSANDRA-14904)
Merged from 3.0:
+ * Avoid thread starvation, and improve compare-and-swap performance, in the
slab allocators (CASSANDRA-15922)
* Add token to tombstone warning and error messages (CASSANDRA-15890)
* Fixed range read concurrency factor computation and capped as 10 times tpc
cores (CASSANDRA-15752)
* Catch exception on bootstrap resume and init native transport
(CASSANDRA-15863)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
