This is an automated email from the ASF dual-hosted git repository.
jmckenzie pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 085765a07c9eb87e05a700ba4395c9df672a60c1
Merge: f53b4149d0 f6fce7ab51
Author: Josh McKenzie <jmcken...@apache.org>
AuthorDate: Mon Apr 3 16:11:01 2023 -0400
Merge branch 'cassandra-4.0' into cassandra-4.1
CHANGES.txt | 4 +++-
src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java | 8 ++++----
src/java/org/apache/cassandra/utils/concurrent/Ref.java | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --cc CHANGES.txt
index c0a6b14f57,c661db958e..4f0272a113
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,18 +1,29 @@@
-4.0.9
- * Backport CASSANDRA-17205 to 4.0 branch - Remove self-reference in
SSTableTidier (CASSANDRA-18332)
- * Avoid loading the preferred IP for BulkLoader streaming (CASSANDRA-18370)
- * Fix BufferPool incorrect memoryInUse when putUnusedPortion is used
(CASSANDRA-18311)
- * Improve memtable allocator accounting when updating AtomicBTreePartition
(CASSANDRA-18125)
- * Update zstd-jni to version 1.5.4-1 (CASSANDRA-18259)
- * Split and order IDEA workspace template VM_PARAMETERS (CASSANDRA-18242)
+4.1.2
+ * Return snapshots with dots in their name in nodetool listsnapshots
(CASSANDRA-18371)
+ * Fix NPE when loading snapshots and data directory is one directory from
root (CASSANDRA-18359)
+ * Do not submit hints when hinted_handoff_enabled=false (CASSANDRA-18304)
+ * Fix COPY ... TO STDOUT behavior in cqlsh (CASSANDRA-18353)
+ * Remove six and Py2SaferScanner merge cruft (CASSANDRA-18354)
+Merged from 4.0:
Merged from 3.11:
* Suppress CVE-2022-45688 (CASSANDRA-18389)
- Merged from 3.0:
+ Merged from 3.0:
* Save host id to system.local and flush immediately after startup
(CASSANDRA-18153)
- * Fix the ordering of sstables when running sstableupgrade tool
(CASSANDRA-18143)
- * Fix default file system error handler for disk_failure_policy die
(CASSANDRA-18294)
-4.0.8
+4.1.1
+ * Deprecate org.apache.cassandra.hadoop code (CASSANDRA-16984)
+ * Fix too early schema version change in sysem local table (CASSANDRA-18291)
+ * Fix copying of JAR of a trigger to temporary file (CASSANDRA-18264)
+ * Fix possible NoSuchFileException when removing a snapshot (CASSANDRA-18211)
+ * PaxosPrepare may add instances to the Electorate that are not in gossip
(CASSANDRA-18194)
+ * Fix PAXOS2_COMMIT_AND_PREPARE_RSP serialisation AssertionError
(CASSANDRA-18164)
+ * Streaming progress virtual table lock contention can trigger
TCP_USER_TIMEOUT and fail streaming (CASSANDRA-18110)
+ * Fix perpetual load of denylist on read in cases where denylist can never
be loaded (CASSANDRA-18116)
+Merged from 4.0:
+ * Fix BufferPool incorrect memoryInUse when putUnusedPortion is used
(CASSANDRA-18311)
+ * Improve memtable allocator accounting when updating AtomicBTreePartition
(CASSANDRA-18125)
+ * Update zstd-jni to version 1.5.4-1 (CASSANDRA-18259)
+ * Split and order IDEA workspace template VM_PARAMETERS (CASSANDRA-18242)
* Log warning message on aggregation queries without key or on multiple keys
(CASSANDRA-18219)
* Fix the output of FQL dump tool to properly separate entries
(CASSANDRA-18215)
* Add cache type information for maximum memory usage warning message
(CASSANDRA-18184)
@@@ -52,28 -44,11 +52,30 @@@ Merged from 3.0
* Add to the IntelliJ Git Window issue navigation links to Cassandra's Jira
(CASSANDRA-18126)
* Avoid anticompaction mixing data from two different time windows with TWCS
(CASSANDRA-17970)
* Do not spam the logs with MigrationCoordinator not being able to pull
schemas (CASSANDRA-18096)
+
+4.1.0
+ * Fix ContentionStrategy backoff and Clock.waitUntil (CASSANDRA-18086)
+Merged from 4.0:
+Merged from 3.11:
+Merged from 3.0:
* Fix incorrect resource name in LIST PERMISSION output (CASSANDRA-17848)
* Suppress CVE-2022-41854 and similar (CASSANDRA-18083)
- * Fix running Ant rat targets without git (CASSANDRA-17974)
-4.0.7
+
+4.1-rc1
+ * Avoid schema mismatch problems on memtable API misconfiguration
(CASSANDRA-18040)
+ * Start Paxos auto repair in CassandraDaemon (CASSANDRA-18029)
+ * Restore streaming_keep_alive_period on the netty control streaming channel
(CASSANDRA-17768)
+ * Move Schema.FORCE_LOAD_KEYSPACES and Schema.FORCE_LOAD_KEYSPACES_PROP to
CassandraRelevantProps (CASSANDRA-17783)
+ * Add --resolve-ip option to nodetool gossipinfo (CASSANDRA-17934)
+ * Allow pre-V5 global limit on bytes in flight to revert to zero
asynchronously in RateLimitingTest (CASSANDRA-17927)
+Merged from 4.0:
++ * Backport CASSANDRA-17205 to 4.0 branch - Remove self-reference in
SSTableTidier (CASSANDRA-18332)
++ * Avoid loading the preferred IP for BulkLoader streaming (CASSANDRA-18370)
+ * Harden parsing of boolean values in CQL in PropertyDefinitions
(CASSANDRA-17878)
+ * Fix error message about type hints (CASSANDRA-17915)
+ * Fix possible race condition on repair snapshots (CASSANDRA-17955)
+ * Fix ASM bytecode version inconsistency (CASSANDRA-17873)
* Remove empty cq4 files in log directory to not fail the startup of BinLog
(CASSANDRA-17933)
* Fix multiple BufferPool bugs (CASSANDRA-16681)
* Fix StorageService.getNativeaddress handling of IPv6 addresses
(CASSANDRA-17945)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
