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 2021/09/06 09:08:55 UTC

[cassandra] branch trunk updated (7294210 -> 3cb656a)

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 7294210  Merge branch 'cassandra-4.0' into trunk
     add 267d3ce  make the addition of regular column to COMPACT tables throw an InvalidRequestException
     add 29d78af  Merge branch 'cassandra-3.0' into cassandra-3.11
     add 9c90cf7  Merge branch 'cassandra-3.11' into cassandra-4.0
     new 3cb656a  Merge branch 'cassandra-4.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                                                   |  1 +
 .../cassandra/cql3/statements/schema/AlterTableStatement.java |  3 +++
 .../cassandra/cql3/validation/operations/AlterTest.java       | 11 +++++++++++
 3 files changed, 15 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-4.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 3cb656a471088c138296bd1cbc7098c2228d7097
Merge: 7294210 9c90cf7
Author: Stefan Miklosovic <sm...@apache.org>
AuthorDate: Mon Sep 6 10:52:43 2021 +0200

    Merge branch 'cassandra-4.0' into trunk

 CHANGES.txt                                                   |  1 +
 .../cassandra/cql3/statements/schema/AlterTableStatement.java |  3 +++
 .../cassandra/cql3/validation/operations/AlterTest.java       | 11 +++++++++++
 3 files changed, 15 insertions(+)

diff --cc CHANGES.txt
index a2a4043,75873fd..c3000d4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -46,6 -28,6 +46,7 @@@ Merged from 3.11
   * Enable tombstone compactions when unchecked_tombstone_compaction is set in TWCS (CASSANDRA-14496)
   * Read only the required SSTables for single partition queries (CASSANDRA-16737)
  Merged from 3.0:
++ * Make the addition of regular column to COMPACT tables throw an InvalidRequestException (CASSANDRA-14564)
   * Fix secondary indexes on primary key columns skipping some writes (CASSANDRA-16868)
   * Use JMX to validate nodetool --jobs parameter (CASSANDRA-16104)
   * Handle properly UnsatisfiedLinkError in NativeLibrary#getProcessID() (CASSANDRA-16578)

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