This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 0e3bdeab73 Merge branch 'cassandra-4.1' into trunk
add fe28f482db Fix sstable_preemptive_open_interval_in_mb disabled value -
backward compatibility patch by Ekaterina Dimitrova; reviewed by Andres de la
Pena and Jon Meredith for CASSANDRA-17737
new b94bf3f218 Merge branch 'cassandra-4.1' 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:
.build/build-rat.xml | 2 ++
CHANGES.txt | 2 ++
NEWS.txt | 6 +++-
build.xml | 2 +-
conf/cassandra.yaml | 2 ++
src/java/org/apache/cassandra/config/Config.java | 6 +++-
.../org/apache/cassandra/config/Converters.java | 32 +++++++++---------
.../cassandra/config/DatabaseDescriptor.java | 9 ++++-
.../cassandra/config/YamlConfigurationLoader.java | 7 +++-
.../apache/cassandra/service/StorageService.java | 2 ++
...ssandra-converters-special-cases-old-names.yaml | 7 ++++
test/conf/cassandra-converters-special-cases.yaml | 7 ++++
.../config/YamlConfigurationLoaderTest.java | 38 ++++++++++++++++++++++
.../cassandra/db/virtual/SettingsTableTest.java | 18 ++++++++++
.../cassandra/service/StorageServiceTest.java | 8 +++++
15 files changed, 128 insertions(+), 20 deletions(-)
create mode 100644 test/conf/cassandra-converters-special-cases-old-names.yaml
create mode 100644 test/conf/cassandra-converters-special-cases.yaml
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
