This is an automated email from the ASF dual-hosted git repository. aleksey pushed a change to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from f5fe483 Merge branch 'cassandra-3.0' into cassandra-3.11 add fc862e2 Prevent recreation of previously dropped columns with a different kind add 670dde9 Merge branch 'cassandra-3.0' into cassandra-3.11 No new revisions were added by this update. Summary of changes: CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 24 ++++++++++++++++++---- .../cql3/statements/AlterTableStatement.java | 20 +++++++++++++----- .../cassandra/schema/LegacySchemaMigrator.java | 2 +- .../apache/cassandra/schema/SchemaKeyspace.java | 10 +++++++-- .../cassandra/utils/NativeSSTableLoaderClient.java | 4 +++- .../cql3/validation/operations/AlterTest.java | 16 +++++++++++++++ .../cassandra/schema/LegacySchemaMigratorTest.java | 2 +- 8 files changed, 65 insertions(+), 14 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org