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 42d18a83e4468827da234c68fad3e3058b368d7c Merge: 98a0b54c40 10a98fe5aa Author: Stefan Miklosovic <smikloso...@apache.org> AuthorDate: Mon Jul 15 15:47:00 2024 +0200 Merge branch 'cassandra-5.0' into trunk conf/cassandra.yaml | 14 ++++++++------ conf/cassandra_latest.yaml | 14 ++++++++------ doc/scripts/convert_yaml_to_adoc.py | 4 +++- 3 files changed, 19 insertions(+), 13 deletions(-) diff --cc doc/scripts/convert_yaml_to_adoc.py index 59620bb208,c34c43900b..bf5e161488 --- a/doc/scripts/convert_yaml_to_adoc.py +++ b/doc/scripts/convert_yaml_to_adoc.py @@@ -50,7 -50,8 +50,9 @@@ COMPLEX_OPTIONS = 'server_encryption_options', 'client_encryption_options', 'transparent_data_encryption_options', - 'hinted_handoff_disabled_datacenters' + 'hinted_handoff_disabled_datacenters', - 'startup_checks' ++ 'startup_checks', ++ 'password_validator' ) def convert(yaml_file, dest_file): --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org