This is an automated email from the ASF dual-hosted git repository.
blerer pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 72dca97 Merge branch 'cassandra-4.0' into trunk
add 9b6dd38 Add flag to disable ALTER...DROP COMPACT STORAGE statements
add 91c12bd Merge branch cassandra-3.0 into cassandra-3.11
add bdb7c3b Merge branch cassandra-3.11 into cassandra-4.0.0
add d51f9d2 Merge branch cassandra-4.0.0 into cassandra-4.0
new c9130d4 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 +
NEWS.txt | 11 +++++++++--
conf/cassandra.yaml | 4 ++++
doc/source/configuration/cass_yaml_file.rst | 8 ++++++++
src/java/org/apache/cassandra/config/Config.java | 2 ++
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 11 +++++++++++
.../cassandra/cql3/statements/schema/AlterTableStatement.java | 5 ++++-
test/conf/cassandra.yaml | 1 +
.../org/apache/cassandra/distributed/test/CountersTest.java | 2 +-
.../distributed/upgrade/CompactStorageUpgradeTest.java | 2 +-
.../apache/cassandra/distributed/upgrade/UpgradeTestBase.java | 10 ++++++++++
.../cassandra/cql3/validation/operations/AlterTest.java | 11 +++++++++++
12 files changed, 63 insertions(+), 5 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
