You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2019/12/11 08:10:42 UTC
[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk
This is an automated email from the ASF dual-hosted git repository.
marcuse pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 1ce979d1e98671ba50b37db5db296a95017e6cfd
Merge: d5a0c29 0225d7c
Author: Marcus Eriksson <ma...@apache.org>
AuthorDate: Wed Dec 11 08:59:16 2019 +0100
Merge branch 'cassandra-3.11' into trunk
CHANGES.txt | 1 +
.../org/apache/cassandra/db/lifecycle/LogFile.java | 71 ++++++++++++++--------
.../apache/cassandra/db/lifecycle/LogRecord.java | 48 +++++++--------
.../cassandra/db/lifecycle/LogTransaction.java | 4 +-
4 files changed, 71 insertions(+), 53 deletions(-)
diff --cc CHANGES.txt
index 4930150,a75c06f..e486a43
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,8 +1,15 @@@
-3.11.6
+4.0-alpha3
+ * Removed obsolete OldNetworkTopologyStrategy (CASSANDRA-13990)
+ * Align record header of FQL and audit binary log (CASSANDRA-15076)
+ * Shuffle forwarding replica for messages to non-local DC (CASSANDRA-15318)
+ * Optimise native protocol ASCII string encoding (CASSANDRA-15410)
+ * Make sure all exceptions are propagated in DebuggableThreadPoolExecutor (CASSANDRA-15332)
+ * Make it possible to resize concurrent read / write thread pools at runtime (CASSANDRA-15277)
+ * Close channels on error (CASSANDRA-15407)
+Merged from 3.11:
* Fix SELECT JSON formatting for the "duration" type (CASSANDRA-15075)
- * Fix LegacyLayout to have same behavior as 2.x when handling unknown column names (CASSANDRA-15081)
Merged from 3.0:
+ * Avoid over-scanning data directories in LogFile.verify() (CASSANDRA-15364)
* Bump generations and document changes to system_distributed and system_traces in 3.0, 3.11
(CASSANDRA-15441)
* Fix system_traces creation timestamp; optimise system keyspace upgrades (CASSANDRA-15398)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org