This is an automated email from the ASF dual-hosted git repository.
blerer pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit c9130d454c4d43a05498c4fad7a1e3d434784791
Merge: 72dca97 d51f9d2
Author: Benjamin Lerer <b.le...@gmail.com>
AuthorDate: Fri Jun 18 15:17:52 2021 +0200
Merge branch cassandra-4.0 into trunk
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
