You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sm...@apache.org on 2024/09/18 21:33:05 UTC
(cassandra) branch trunk updated (941a7a2de7 -> a8ae50ff9b)
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 941a7a2de7 Merge branch 'cassandra-5.0' into trunk
add 39b1c2df89 Emit error when altering a table with non-frozen UDTs with nested non-frozen collections the same way as done upon table creation
add 7b1eb1f0b7 Merge branch 'cassandra-4.0' into cassandra-4.1
add 703dd13a54 Merge branch 'cassandra-4.1' into cassandra-5.0
new a8ae50ff9b Merge branch 'cassandra-5.0' into trunk
The 1 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 | 2 ++
.../cassandra/cql3/statements/schema/AlterTableStatement.java | 11 +++++++++++
.../cassandra/cql3/validation/entities/UserTypesTest.java | 5 +++++
3 files changed, 18 insertions(+)
---------------------------------------------------------------------
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-5.0' into trunk
Posted by sm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit a8ae50ff9b138377474d6c18361abe8fe06d677f
Merge: 941a7a2de7 703dd13a54
Author: Stefan Miklosovic <sm...@apache.org>
AuthorDate: Wed Sep 18 23:11:19 2024 +0200
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 2 ++
.../cassandra/cql3/statements/schema/AlterTableStatement.java | 11 +++++++++++
.../cassandra/cql3/validation/entities/UserTypesTest.java | 5 +++++
3 files changed, 18 insertions(+)
diff --cc src/java/org/apache/cassandra/cql3/statements/schema/AlterTableStatement.java
index 15ed785ca6,5f37acf09b..3a5b9ae8fb
--- a/src/java/org/apache/cassandra/cql3/statements/schema/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/schema/AlterTableStatement.java
@@@ -45,8 -44,11 +45,9 @@@ import org.apache.cassandra.cql3.CQLSta
import org.apache.cassandra.cql3.ColumnIdentifier;
import org.apache.cassandra.cql3.QualifiedName;
import org.apache.cassandra.cql3.functions.masking.ColumnMask;
-import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.db.guardrails.Guardrails;
import org.apache.cassandra.db.marshal.AbstractType;
-
+ import org.apache.cassandra.db.marshal.UserType;
import org.apache.cassandra.exceptions.InvalidRequestException;
import org.apache.cassandra.gms.ApplicationState;
import org.apache.cassandra.gms.Gossiper;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org