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/06/27 14:24:15 UTC

[cassandra] branch cassandra-4.0 updated (48c1b7f9b4 -> 90e2502c6c)

This is an automated email from the ASF dual-hosted git repository.

adelapena pushed a change to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


    from 48c1b7f9b4 Merge branch 'cassandra-3.11' into cassandra-4.0
     new 09692d5a58 Fix writetime and ttl functions forbidden for collections instead of multicell columns
     new bc8a260471 Merge branch 'cassandra-3.0' into cassandra-3.11
     new 90e2502c6c Merge branch 'cassandra-3.11' into cassandra-4.0

The 3 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 +
 .../cassandra/pages/cql/cql_singlefile.adoc        |   4 +-
 doc/modules/cassandra/pages/cql/dml.adoc           |   3 +
 .../cassandra/cql3/selection/Selectable.java       |   8 +-
 .../validation/entities/WritetimeOrTTLTest.java    | 264 +++++++++++++++++++++
 5 files changed, 276 insertions(+), 4 deletions(-)
 create mode 100644 test/unit/org/apache/cassandra/cql3/validation/entities/WritetimeOrTTLTest.java


---------------------------------------------------------------------
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-3.11' into cassandra-4.0

Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

adelapena pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 90e2502c6c7826bdb14cebcece81440307a7420e
Merge: 48c1b7f9b4 bc8a260471
Author: Andrés de la Peña <a....@gmail.com>
AuthorDate: Mon Jun 27 15:14:35 2022 +0100

    Merge branch 'cassandra-3.11' into cassandra-4.0

 CHANGES.txt                                        |   1 +
 .../cassandra/pages/cql/cql_singlefile.adoc        |   4 +-
 doc/modules/cassandra/pages/cql/dml.adoc           |   3 +
 .../cassandra/cql3/selection/Selectable.java       |   8 +-
 .../validation/entities/WritetimeOrTTLTest.java    | 264 +++++++++++++++++++++
 5 files changed, 276 insertions(+), 4 deletions(-)

diff --cc CHANGES.txt
index 9cff1452dd,cebe5fa7bf..0d52eae3b4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,7 +1,14 @@@
 -3.11.14
 +4.0.5
 + * SSL storage port in sstableloader is deprecated (CASSANDRA-17602)
 + * Fix counter write timeouts at ONE (CASSANDRA-17411)
 + * Fix NPE in getLocalPrimaryRangeForEndpoint (CASSANDRA-17680)
 + * Remove SSL storage port from sstableloader (CASSANDRA-17602)
 + * Allow Java 11 to satisfy RPM/Debian packaging (CASSANDRA-17669)
 + * Ensure FileStreamTask cannot compromise shared channel proxy for system table when interrupted (CASSANDRA-17663)
 + * silence benign SslClosedEngineException (CASSANDRA-17565)
 +Merged from 3.11:
  Merged from 3.0:
+  * Fix writetime and ttl functions forbidden for collections instead of multicell columns (CASSANDRA-17628)
 - * Supress CVE-2020-7238 (CASSANDRA-17697)
   * Fix issue where frozen maps may not be serialized in the correct order (CASSANDRA-17623)
   * Suppress CVE-2022-24823 (CASSANDRA-17633)
   * fsync TOC and digest files (CASSANDRA-10709)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org