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 7f38db348e62dbfb64944a2a78ad88485b2190a6
Merge: b12a9083a9 c3998ef601
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Thu Jun 16 06:00:57 2022 -0500
Merge branch 'cassandra-4.0' into cassandra-4.1
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 2 ++
2 files changed, 3 insertions(+)
diff --cc CHANGES.txt
index a28d478597,e9f4526e06..238dfcb7d1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
-4.0.5
+4.1-alpha2
+ * Fix missed nowInSec values in QueryProcessor (CASSANDRA-17458)
+ * Revert removal of withBufferSizeInMB(int size) in CQLSSTableWriter.Builder
class and deprecate it in favor of withBufferSizeInMiB(int size)
(CASSANDRA-17675)
+ * Remove expired snapshots of dropped tables after restart (CASSANDRA-17619)
+Merged from 4.0:
+ * Fix NPE in getLocalPrimaryRangeForEndpoint (CASSANDRA-17680)
* Remove SSL storage port from sstableloader (CASSANDRA-17602)
* Allow Java 11 to satisfy RPM/Debian packaging (CASSANDRA-17669)
* Ensure FileStreamTask cannot compromise shared channel proxy for system
table when interrupted (CASSANDRA-17663)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
