This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 90e0ef27e4b0ebb3611142ae40e03c58473b5cc5 Merge: a1de444331 6befb178aa Author: Andrés de la Peña <[email protected]> AuthorDate: Wed Oct 4 17:33:15 2023 +0100 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Constants.java | 2 +- .../db/marshal/AbstractCompositeType.java | 6 +++ .../cassandra/db/marshal/AbstractTimeUUIDType.java | 7 ++++ .../apache/cassandra/db/marshal/AbstractType.java | 2 +- .../apache/cassandra/db/marshal/BooleanType.java | 7 ++++ .../org/apache/cassandra/db/marshal/ByteType.java | 6 --- .../org/apache/cassandra/db/marshal/BytesType.java | 6 +++ .../cassandra/db/marshal/CollectionType.java | 6 --- .../cassandra/db/marshal/CounterColumnType.java | 7 ++++ .../apache/cassandra/db/marshal/DecimalType.java | 7 ++++ .../apache/cassandra/db/marshal/DoubleType.java | 7 ++++ .../apache/cassandra/db/marshal/DurationType.java | 6 --- .../org/apache/cassandra/db/marshal/FloatType.java | 7 ++++ .../cassandra/db/marshal/InetAddressType.java | 7 ++++ .../org/apache/cassandra/db/marshal/Int32Type.java | 7 ++++ .../apache/cassandra/db/marshal/IntegerType.java | 7 ++++ .../cassandra/db/marshal/LexicalUUIDType.java | 7 ++++ .../org/apache/cassandra/db/marshal/LongType.java | 7 ++++ .../org/apache/cassandra/db/marshal/ShortType.java | 6 --- .../cassandra/db/marshal/SimpleDateType.java | 6 --- .../apache/cassandra/db/marshal/StringType.java | 6 +++ .../org/apache/cassandra/db/marshal/TimeType.java | 6 --- .../apache/cassandra/db/marshal/TimestampType.java | 6 +++ .../org/apache/cassandra/db/marshal/TupleType.java | 6 +++ .../org/apache/cassandra/db/marshal/UUIDType.java | 7 ++++ .../apache/cassandra/db/marshal/VectorType.java | 44 +++++++++++++++------- .../cql3/validation/operations/CQLVectorTest.java | 43 +++++++++++++++++++++ 28 files changed, 190 insertions(+), 52 deletions(-) diff --cc CHANGES.txt index 1870ba0ac2,12c8fbc0e3..57e241c7cf --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ -5.0-alpha2 +5.1 + * Add ELAPSED command to cqlsh (CASSANDRA-18861) + * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781) + * Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787) +Merged from 5.0: + * Remove support for empty values on the vector data type (CASSANDRA-18876) * Upgrade Dropwizard Metrics to 4.2.19 (CASSANDRA-14667) * Upgrade caffeine cache and fix CIDR permissions cache invalidation (CASSANDRA-18805) * Remove deprecated properties in CompressionParams (CASSANDRA-18742) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
