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 e2b5c0f7ef507a57af5a4ff5478cc16c07531c88
Merge: 72ca73f a311109
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Sat Feb 27 17:07:00 2021 +0100
Merge branch 'cassandra-3.11' into trunk
CHANGES.txt | 1 +
debian/compat | 2 +-
debian/control | 4 ++--
debian/rules | 4 ++--
4 files changed, 6 insertions(+), 5 deletions(-)
diff --cc CHANGES.txt
index 8be989c,ba1b42c..4dfa9d9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,39 -1,7 +1,40 @@@
-3.11.11
+4.0-beta5
+ * Prevent parent repair sessions leak (CASSANDRA-16446)
+ * Fix timestamp issue in SinglePartitionSliceCommandTest
testPartitionD…eletionRowDeletionTie (CASSANDRA-16443)
+ * Promote protocol V5 out of beta (CASSANDRA-14973)
+ * Fix incorrect encoding for strings can be UTF8 (CASSANDRA-16429)
+ * Fix node unable to join when RF > N in multi-DC with added warning
(CASSANDRA-16296)
+ * Add an option to nodetool tablestats to check sstable location correctness
(CASSANDRA-16344)
+ * Unable to ALTER KEYSPACE while decommissioned/assassinated nodes are in
gossip (CASSANDRA-16422)
+ * Metrics backward compatibility restored after CASSANDRA-15066
(CASSANDRA-16083)
+ * Reduce new reserved keywords introduced since 3.0 (CASSANDRA-16439)
+ * Improve system tables handling in case of disk failures (CASSANDRA-14793)
+ * Add access and datacenters to unreserved keywords (CASSANDRA-16398)
+ * Fix nodetool ring, status output when DNS resolution or port printing are
in use (CASSANDRA-16283)
+ * Upgrade Jacoco to 0.8.6 (for Java 11 support) (CASSANDRA-16365)
+ * Move excessive repair debug loggings to trace level (CASSANDRA-16406)
+ * Restore validation of each message's protocol version (CASSANDRA-16374)
+ * Upgrade netty and chronicle-queue dependencies to get Auditing and native
library loading working on arm64 architectures (CASSANDRA-16384,CASSANDRA-16392)
+ * Release StreamingTombstoneHistogramBuilder spool when switching writers
(CASSANDRA-14834)
+ * Correct memtable on-heap size calculations to match actual use
(CASSANDRA-16318)
+ * Fix client notifications in CQL protocol v5 (CASSANDRA-16353)
+ * Too defensive check when picking sstables for preview repair
(CASSANDRA-16284)
+ * Ensure pre-negotiation native protocol responses have correct stream id
(CASSANDRA-16376)
+ * Fix check for -Xlog in cassandra-env.sh (CASSANDRA-16279)
+ * SSLFactory should initialize SSLContext before setting protocols
(CASSANDRA-16362)
+ * Restore sasi dependencies jflex, snowball-stemmer, and concurrent-trees,
in the cassandra-all pom (CASSANDRA-16303)
+ * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
+Merged from 3.11:
+ * Fix digest computation for queries with fetched but non queried columns
(CASSANDRA-15962)
+ * Reduce amount of allocations during batch statement execution
(CASSANDRA-16201)
+ * Update jflex-1.6.0.jar to match upstream (CASSANDRA-16393)
Merged from 3.0:
+ * Update debian packaging for python3 (CASSANDRA-16396)
* Avoid pushing schema mutations when setting up distributed system
keyspaces locally (CASSANDRA-16387)
+ * Prevent unbounded number of pending flushing tasks (CASSANDRA-16261)
+ * Improve empty hint file handling during startup (CASSANDRA-16162)
+ * Fix skipping on pre-3.0 created compact storage sstables due to missing
primary key liveness (CASSANDRA-16226)
+ * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372)
Merged from 2.2:
* Make TokenMetadata's ring version increments atomic (CASSANDRA-16286)
diff --cc debian/control
index 13f2a45,328502e..720c1de
--- a/debian/control
+++ b/debian/control
@@@ -3,10 -3,10 +3,10 @@@ Section: mis
Priority: extra
Maintainer: Eric Evans <eev...@apache.org>
Uploaders: Sylvain Lebresne <slebre...@apache.org>
- Build-Depends: debhelper (>= 5), openjdk-8-jdk | java8-jdk, ant (>= 1.9),
ant-optional (>= 1.9), dh-python, python-dev (>= 2.7), quilt, bash-completion
-Build-Depends: debhelper (>= 11), openjdk-8-jdk | java8-jdk, ant (>= 1.9),
ant-optional (>= 1.9), dh-python, python3-dev (>= 3.6), dpatch, bash-completion
++Build-Depends: debhelper (>= 11), openjdk-8-jdk | java8-jdk, ant (>= 1.9),
ant-optional (>= 1.9), dh-python, python3-dev (>= 3.6), quilt, bash-completion
Homepage: http://cassandra.apache.org
-Vcs-Git: http://git-wip-us.apache.org/repos/asf/cassandra.git
-Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=cassandra.git
+Vcs-Git: https://gitbox.apache.org/repos/asf/cassandra.git
+Vcs-Browser: https://gitbox.apache.org/repos/asf?p=cassandra.git
Standards-Version: 3.8.3
Package: cassandra
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
