You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ad...@apache.org on 2022/05/20 10:59:26 UTC
[cassandra] branch trunk updated (23e5da9358 -> 56ce8d1f7f)
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 23e5da9358 Merge branch 'cassandra-4.1' into trunk
new ffc4c89c3d Fix issue where frozen maps may not be serialized in the correct order
new 0e1d068d92 Merge branch 'cassandra-3.0' into cassandra-3.11
new 5cf6db30f6 Merge branch 'cassandra-3.11' into cassandra-4.0
new c1d163abad Merge branch 'cassandra-4.0' into cassandra-4.1
new 56ce8d1f7f Merge branch 'cassandra-4.1' into trunk
The 5 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 +
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-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
Posted by ad...@apache.org.
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....@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-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org