You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2023/04/07 18:45:27 UTC

[cassandra] branch cassandra-4.1 updated (527f12e3ee -> edb34e2f62)

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a change to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git


    from 527f12e3ee fix error in conflict edit
     add 30639d8852 Suppress CVE-2022-45688
     add 9a3a37c5b3 DOC - Added :stem: latexmath to Data Modeling page to fix display of equations
     add 21c3e9731c fix error in conflict edit
     add d41e69a652 Suppress CVE-2022-45688
     add 83dd275d5d DOC - Added :stem: latexmath to Data Modeling page to fix display of equations
     new 5d315f869d Merge branch 'cassandra-3.11' into cassandra-4.0
     new 7d84ad9366 Revert "fix error in conflict edit"
     new edb34e2f62 Merge branch 'cassandra-4.0' into cassandra-4.1

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[cassandra] 01/01: Merge branch 'cassandra-4.0' into cassandra-4.1

Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit edb34e2f626be0c04d3055a66611cb0a2541bc91
Merge: 527f12e3ee 7d84ad9366
Author: Brandon Williams <br...@apache.org>
AuthorDate: Fri Apr 7 13:42:45 2023 -0500

    Merge branch 'cassandra-4.0' into cassandra-4.1

 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)

diff --cc CHANGES.txt
index 536c672b7c,31c5213fad..718fe56ff1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,30 -1,20 +1,31 @@@
 -4.0.9
 +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:
   * Update zstd-jni library to version 1.5.5 (CASSANDRA-18429)
 - * 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)
  Merged from 3.11:
   * Suppress CVE-2022-45688 (CASSANDRA-18389)
+  * Fix Splitter sometimes creating more splits than requested (CASSANDRA-18013)
  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)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org