This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit d44dbd91c1752a71f4819be92fd75a52be9f0118
Merge: 5bb76ba 72941b9
Author: Andrés de la Peña <a.penya.gar...@gmail.com>
AuthorDate: Wed Oct 21 13:19:13 2020 +0100
Merge branch 'cassandra-2.2' into cassandra-3.0
# Conflicts:
# CHANGES.txt
CHANGES.txt | 1 +
build.xml | 14 ++++++++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --cc CHANGES.txt
index 0f9694e,8a78993..af7245a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,9 +1,24 @@@
-2.2.19
+3.0.23:
+ * Check SSTables for latest version before dropping compact storage
(CASSANDRA-16063)
+ * Handle unexpected columns due to schema races (CASSANDRA-15899)
+ * Avoid failing compactions with very large partitions (CASSANDRA-15164)
+ * Use IF NOT EXISTS for index and UDT create statements in snapshot schema
files (CASSANDRA-13935)
+ * Add flag to ignore unreplicated keyspaces during repair (CASSANDRA-15160)
+Merged from 2.2:
+ * Package tools/bin scripts as executable (CASSANDRA-16151)
- * Fix ExceptionInInitializerError when data_file_directories is not set
(CASSANDRA-16008)
* Fixed a NullPointerException when calling nodetool enablethrift
(CASSANDRA-16127)
-2.2.18
+3.0.22:
+ * Fix gossip shutdown order (CASSANDRA-15816)
+ * Remove broken 'defrag-on-read' optimization (CASSANDRA-15432)
+ * Check for endpoint collision with hibernating nodes (CASSANDRA-14599)
+ * Operational improvements and hardening for replica filtering protection
(CASSANDRA-15907)
+ * stop_paranoid disk failure policy is ignored on CorruptSSTableException
after node is up (CASSANDRA-15191)
+ * 3.x fails to start if commit log has range tombstones from a column which
is also deleted (CASSANDRA-15970)
+ * Forbid altering UDTs used in partition keys (CASSANDRA-15933)
+ * Fix empty/null json string representation (CASSANDRA-15896)
+ * Handle difference in timestamp precision between java8 and java11 in
LogFIle.java (CASSANDRA-16050)
+Merged from 2.2:
* Fix CQL parsing of collections when the column type is reversed
(CASSANDRA-15814)
Merged from 2.1:
* Only allow strings to be passed to JMX authentication (CASSANDRA-16077)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
