This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 0eaed71d1df4da0434397d87e9845dfad0d4f909
Merge: 45331bb 815de99
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Mon Aug 31 20:58:23 2020 +0200
Merge branch 'cassandra-2.2' into cassandra-3.0
CHANGES.txt | 2 ++
build.xml | 2 +-
debian/changelog | 6 ++++++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --cc CHANGES.txt
index 765097b,9cccd7c..ddf04fa
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,6 +1,16 @@@
-2.2.19
++3.0.23:
+
-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)
diff --cc build.xml
index 6c1d148,5f404fe..6795da3
--- a/build.xml
+++ b/build.xml
@@@ -25,7 -25,7 +25,7 @@@
<property name="debuglevel" value="source,lines,vars"/>
<!-- default version and SCM information -->
- <property name="base.version" value="3.0.22"/>
- <property name="base.version" value="2.2.19"/>
++ <property name="base.version" value="3.0.23"/>
<property name="scm.connection"
value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/>
<property name="scm.developerConnection"
value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/>
<property name="scm.url"
value="https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree"/>
diff --cc debian/changelog
index 40f578d,1f34b7a..a321b82
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,10 +1,10 @@@
-cassandra (2.2.19) unstable; urgency=medium
++cassandra (3.0.23) unstable; urgency=medium
+
+ * New release
+
+ --
+
-cassandra (2.2.18) unstable; urgency=medium
+cassandra (3.0.22) unstable; urgency=medium
* New release
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
