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 56ce8d1f7f90fa9dd9d1b0e3507dab0cd2dec0cf
Merge: 23e5da9358 c1d163abad
Author: Andrés de la Peña <a.penya.gar...@gmail.com>
AuthorDate: Fri May 20 11:52:49 2022 +0100
Merge branch 'cassandra-4.1' into trunk
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cql3/Maps.java | 11 +-
src/java/org/apache/cassandra/cql3/Sets.java | 2 +-
test/unit/org/apache/cassandra/cql3/CQLTester.java | 34 +++-
.../cql3/conditions/ColumnConditionTest.java | 6 +-
.../cql3/validation/entities/CollectionsTest.java | 99 ++++++++++++
.../cassandra/io/sstable/CQLSSTableWriterTest.java | 171 ++++++++++++++++++++-
7 files changed, 308 insertions(+), 16 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
