This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 607d6d0361184e478fcc1cd00be89c864a3a7455
Merge: c5c4cd4e57 93692a4b17
Author: Stefan Miklosovic <smikloso...@apache.org>
AuthorDate: Tue Apr 23 01:14:31 2024 +0200
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
.../org/apache/cassandra/db/marshal/DateType.java | 2 +-
.../apache/cassandra/db/marshal/TimestampType.java | 2 +-
.../cassandra/serializers/TimestampSerializer.java | 35 ++++++++++++----------
4 files changed, 23 insertions(+), 17 deletions(-)
diff --cc CHANGES.txt
index 3e2fa40c1e,1d51d2d27d..cf55f7b91c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -72,9 -36,10 +72,10 @@@ Merged from 4.1
* Fix hints delivery for a node going down repeatedly (CASSANDRA-19495)
* Do not go to disk for reading hints file sizes (CASSANDRA-19477)
* Fix system_views.settings to handle array types (CASSANDRA-19475)
- * Memoize Cassandra verion and add a backoff interval for failed schema
pulls (CASSANDRA-18902)
* Fix StackOverflowError on ALTER after many previous schema changes
(CASSANDRA-19166)
+ * Memoize Cassandra verion (CASSANDRA-18902)
Merged from 4.0:
+ * Fix CQL tojson timestamp output on negative timestamp values before
Gregorian calendar reform in 1582 (CASSANDRA-19566)
* Fix few types issues and implement types compatibility tests
(CASSANDRA-19479)
* Change logging to TRACE when failing to get peer certificate
(CASSANDRA-19508)
* Push LocalSessions info logs to debug (CASSANDRA-18335)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
