This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit cf9091a12c655d5ec58c62f5ac7d3f9cf0bcd3a5
Merge: 9a1bb62 7e68448
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Thu Jan 20 09:48:54 2022 -0600
Merge branch 'cassandra-3.11' into cassandra-4.0
CHANGES.txt | 1 +
build.xml | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --cc CHANGES.txt
index d9303f8,c810378..6492096
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,36 -1,17 +1,37 @@@
-3.11.12
- * Upgrade snakeyaml to 1.26 in 3.11 (CASSANDRA=17028)
+4.0.2
+ * Don't block gossip when clearing repair snapshots (CASSANDRA-17168)
+ * Deduplicate warnings for deprecated parameters (changed names)
(CASSANDRA-17160)
+ * Update ant-junit to version 1.10.12 (CASSANDRA-17218)
+ * Add droppable tombstone metrics to nodetool tablestats (CASSANDRA-16308)
+ * Fix disk failure triggered when enabling FQL on an unclean directory
(CASSANDRA-17136)
+ * Fixed broken classpath when multiple jars in build directory
(CASSANDRA-17129)
+ * DebuggableThreadPoolExecutor does not propagate client warnings
(CASSANDRA-17072)
+ * internode_send_buff_size_in_bytes and internode_recv_buff_size_in_bytes
have new names. Backward compatibility with the old names added
(CASSANDRA-17141)
+ * Remove unused configuration parameters from cassandra.yaml
(CASSANDRA-17132)
+ * Queries performed with NODE_LOCAL consistency level do not update request
metrics (CASSANDRA-17052)
+ * Fix multiple full sources can be select unexpectedly for bootstrap
streaming (CASSANDRA-16945)
+ * Fix cassandra.yaml formatting of parameters (CASSANDRA-17131)
+ * Add backward compatibility for CQLSSTableWriter Date fields
(CASSANDRA-17117)
+ * Push initial client connection messages to trace (CASSANDRA-17038)
+ * Correct the internode message timestamp if sending node has wrapped
(CASSANDRA-16997)
+ * Avoid race causing us to return null in RangesAtEndpoint (CASSANDRA-16965)
+ * Avoid rewriting all sstables during cleanup when transient replication is
enabled (CASSANDRA-16966)
+ * Prevent CQLSH from failure on Python 3.10 (CASSANDRA-16987)
+ * Avoid trying to acquire 0 permits from the rate limiter when taking
snapshot (CASSANDRA-16872)
+ * Upgrade Caffeine to 2.5.6 (CASSANDRA-15153)
+ * Include SASI components to snapshots (CASSANDRA-15134)
+ * Fix missed wait latencies in the output of `nodetool tpstats -F`
(CASSANDRA-16938)
+ * Remove all the state pollution between tests in SSTableReaderTest
(CASSANDRA-16888)
+ * Delay auth setup until after gossip has settled to avoid unavailables on
startup (CASSANDRA-16783)
+ * Fix clustering order logic in CREATE MATERIALIZED VIEW (CASSANDRA-16898)
+ * org.apache.cassandra.db.rows.ArrayCell#unsharedHeapSizeExcludingData
includes data twice (CASSANDRA-16900)
+ * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies
(CASSANDRA-16854)
+Merged from 3.11:
* Add key validation to ssstablescrub (CASSANDRA-16969)
* Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851)
- * Include SASI components to snapshots (CASSANDRA-15134)
* Make assassinate more resilient to missing tokens (CASSANDRA-16847)
- * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies
(CASSANDRA-16854)
- * Validate SASI tokenizer options before adding index to schema
(CASSANDRA-15135)
- * Fixup scrub output when no data post-scrub and clear up old use of row,
which really means partition (CASSANDRA-16835)
- * Fix ant-junit dependency issue (CASSANDRA-16827)
- * Reduce thread contention in CommitLogSegment and HintsBuffer
(CASSANDRA-16072)
- * Avoid sending CDC column if not enabled (CASSANDRA-16770)
Merged from 3.0:
+ * Upgrade logback to 1.2.9 (CASSANDRA-17204)
* Avoid race in AbstractReplicationStrategy endpoint caching
(CASSANDRA-16673)
* Fix abort when window resizing during cqlsh COPY (CASSANDRA-15230)
* Fix slow keycache load which blocks startup for tables with many sstables
(CASSANDRA-14898)
diff --cc build.xml
index 89c0cac,a094e8b..d3e0abd
--- a/build.xml
+++ b/build.xml
@@@ -514,11 -348,11 +514,11 @@@
<dependency groupId="org.antlr" artifactId="antlr-runtime"
version="3.5.2">
<exclusion groupId="org.antlr" artifactId="stringtemplate"/>
</dependency>
- <dependency groupId="org.slf4j" artifactId="slf4j-api"
version="1.7.7"/>
- <dependency groupId="org.slf4j" artifactId="log4j-over-slf4j"
version="1.7.7"/>
- <dependency groupId="org.slf4j" artifactId="jcl-over-slf4j"
version="1.7.7" />
+ <dependency groupId="org.slf4j" artifactId="slf4j-api"
version="1.7.25"/>
+ <dependency groupId="org.slf4j" artifactId="log4j-over-slf4j"
version="1.7.25"/>
+ <dependency groupId="org.slf4j" artifactId="jcl-over-slf4j"
version="1.7.25" />
- <dependency groupId="ch.qos.logback" artifactId="logback-core"
version="1.2.3"/>
- <dependency groupId="ch.qos.logback" artifactId="logback-classic"
version="1.2.3"/>
+ <dependency groupId="ch.qos.logback" artifactId="logback-core"
version="1.2.9"/>
+ <dependency groupId="ch.qos.logback" artifactId="logback-classic"
version="1.2.9"/>
<dependency groupId="com.fasterxml.jackson.core"
artifactId="jackson-core" version="2.12.5"/>
<dependency groupId="com.fasterxml.jackson.core"
artifactId="jackson-databind" version="2.12.5"/>
<dependency groupId="com.fasterxml.jackson.core"
artifactId="jackson-annotations" version="2.12.5"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
