This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit a56bd764dcb3c3fbb87a9570b94aaa2518f32cfe
Merge: 3b97e4b 558d4ed
Author: Bereng <berenguerbl...@gmail.com>
AuthorDate: Wed Jun 9 08:48:05 2021 +0200
Merge branch 'cassandra-4.0' into trunk
.../cassandra/cql3/ViewComplexDeletionsTest.java | 3 +-
.../cassandra/cql3/ViewComplexLivenessTest.java | 258 ++++++++++++++++
.../apache/cassandra/cql3/ViewComplexTTLTest.java | 3 +-
.../org/apache/cassandra/cql3/ViewComplexTest.java | 180 +----------
.../cassandra/cql3/ViewComplexUpdatesTest.java | 3 +-
...Test.java => ViewFilteringClustering1Test.java} | 245 +--------------
.../cql3/ViewFilteringClustering2Test.java | 329 +++++++++++++++++++++
.../apache/cassandra/cql3/ViewFilteringPKTest.java | 5 +-
.../apache/cassandra/cql3/ViewFilteringTest.java | 5 +-
test/unit/org/apache/cassandra/cql3/ViewTest.java | 1 +
.../InsertUpdateIfConditionCollectionsTest.java | 2 +-
.../InsertUpdateIfConditionStaticsTest.java | 2 +-
.../operations/InsertUpdateIfConditionTest.java | 2 +-
13 files changed, 609 insertions(+), 429 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
