This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 54aee87c56a49a0b834b920aead7e0dbed5f5640
Merge: b83d722 0aad2e9
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Wed Jan 5 23:02:59 2022 +0100

    Merge branch 'cassandra-4.0' into trunk

 .build/build-rat.xml                               |    3 +
 .gitignore                                         |    5 +-
 build.xml                                          |   11 +-
 doc/Dockerfile                                     |   22 -
 doc/Makefile                                       |  316 +-
 doc/README.md                                      |   45 +-
 doc/antora.yml                                     |    9 +
 doc/docker-compose.yml                             |   29 -
 doc/make.bat                                       |  299 --
 doc/modules/ROOT/nav.adoc                          |    4 +
 doc/modules/ROOT/pages/index.adoc                  |   50 +
 .../cassandra/assets/images}/Figure_1_backups.jpg  |  Bin
 .../assets}/images/Figure_1_data_model.jpg         |  Bin
 .../assets/images}/Figure_1_guarantees.jpg         |  Bin
 .../assets/images}/Figure_1_read_repair.jpg        |  Bin
 .../assets}/images/Figure_2_data_model.jpg         |  Bin
 .../assets/images}/Figure_2_read_repair.jpg        |  Bin
 .../assets/images}/Figure_3_read_repair.jpg        |  Bin
 .../assets/images}/Figure_4_read_repair.jpg        |  Bin
 .../assets/images}/Figure_5_read_repair.jpg        |  Bin
 .../assets/images}/Figure_6_read_repair.jpg        |  Bin
 .../images/data_modeling_chebotko_logical.png      |  Bin
 .../images/data_modeling_chebotko_physical.png     |  Bin
 .../images/data_modeling_hotel_bucketing.png       |  Bin
 .../assets}/images/data_modeling_hotel_erd.png     |  Bin
 .../assets}/images/data_modeling_hotel_logical.png |  Bin
 .../images/data_modeling_hotel_physical.png        |  Bin
 .../assets}/images/data_modeling_hotel_queries.png |  Bin
 .../images/data_modeling_hotel_relational.png      |  Bin
 .../images/data_modeling_reservation_logical.png   |  Bin
 .../images/data_modeling_reservation_physical.png  |  Bin
 .../cassandra/assets}/images/docs_commit.png       |  Bin
 .../assets}/images/docs_create_branch.png          |  Bin
 .../cassandra/assets}/images/docs_create_file.png  |  Bin
 .../cassandra/assets}/images/docs_editor.png       |  Bin
 .../cassandra/assets}/images/docs_fork.png         |  Bin
 .../cassandra/assets}/images/docs_pr.png           |  Bin
 .../cassandra/assets}/images/docs_preview.png      |  Bin
 .../cassandra/assets}/images/eclipse_debug0.png    |  Bin
 .../cassandra/assets}/images/eclipse_debug1.png    |  Bin
 .../cassandra/assets}/images/eclipse_debug2.png    |  Bin
 .../cassandra/assets}/images/eclipse_debug3.png    |  Bin
 .../cassandra/assets}/images/eclipse_debug4.png    |  Bin
 .../cassandra/assets}/images/eclipse_debug5.png    |  Bin
 .../cassandra/assets}/images/eclipse_debug6.png    |  Bin
 .../assets/images}/example-stress-graph.png        |  Bin
 .../cassandra/assets/images}/generatetokens.rst    |    0
 .../cassandra/assets}/images/hints.svg             |    0
 .../cassandra/assets}/images/ring.svg              |    0
 .../cassandra/assets}/images/vnodes.svg            |    0
 .../cassandra/assets}/license_compliance.rst       |    0
 .../cassandra/examples/BASH/add_repo_keys.sh       |    1 +
 .../cassandra/examples/BASH/apt-get_cass.sh        |    1 +
 .../cassandra/examples/BASH/apt-get_update.sh      |    1 +
 .../cassandra/examples/BASH/check_backups.sh       |    1 +
 .../cassandra/examples/BASH/cqlsh_localhost.sh     |    1 +
 .../cassandra/examples/BASH/curl_install.sh        |    1 +
 .../cassandra/examples/BASH/curl_verify_sha.sh     |    1 +
 .../cassandra/examples/BASH/docker_cqlsh.sh        |    1 +
 doc/modules/cassandra/examples/BASH/docker_pull.sh |    1 +
 doc/modules/cassandra/examples/BASH/docker_run.sh  |    1 +
 .../cassandra/examples/BASH/find_backups.sh        |    1 +
 .../cassandra/examples/BASH/find_snapshots.sh      |    1 +
 .../cassandra/examples/BASH/find_sstables.sh       |    1 +
 .../cassandra/examples/BASH/find_two_snapshots.sh  |    1 +
 .../cassandra/examples/BASH/flush_and_check.sh     |    2 +
 .../cassandra/examples/BASH/get_deb_package.sh     |    2 +
 doc/modules/cassandra/examples/BASH/java_verify.sh |    1 +
 .../examples/BASH/nodetool_clearsnapshot.sh        |    1 +
 .../examples/BASH/nodetool_clearsnapshot_all.sh    |    1 +
 .../cassandra/examples/BASH/nodetool_flush.sh      |    3 +
 .../examples/BASH/nodetool_flush_table.sh          |    1 +
 .../examples/BASH/nodetool_list_snapshots.sh       |    1 +
 .../cassandra/examples/BASH/nodetool_snapshot.sh   |    1 +
 .../cassandra/examples/BASH/nodetool_status.sh     |    1 +
 .../examples/BASH/nodetool_status_nobin.sh         |    1 +
 doc/modules/cassandra/examples/BASH/run_cqlsh.sh   |    1 +
 .../cassandra/examples/BASH/run_cqlsh_nobin.sh     |    1 +
 .../cassandra/examples/BASH/snapshot_backup2.sh    |    1 +
 .../examples/BASH/snapshot_both_backups.sh         |    1 +
 .../cassandra/examples/BASH/snapshot_files.sh      |    1 +
 .../cassandra/examples/BASH/snapshot_mult_ks.sh    |    1 +
 .../examples/BASH/snapshot_mult_tables.sh          |    1 +
 .../examples/BASH/snapshot_mult_tables_again.sh    |    1 +
 .../cassandra/examples/BASH/snapshot_one_table.sh  |    1 +
 .../cassandra/examples/BASH/snapshot_one_table2.sh |    1 +
 .../cassandra/examples/BASH/start_tarball.sh       |    1 +
 doc/modules/cassandra/examples/BASH/tail_syslog.sh |    1 +
 .../cassandra/examples/BASH/tail_syslog_package.sh |    1 +
 doc/modules/cassandra/examples/BASH/tarball.sh     |    1 +
 doc/modules/cassandra/examples/BASH/verify_gpg.sh  |    1 +
 doc/modules/cassandra/examples/BASH/yum_cass.sh    |    1 +
 doc/modules/cassandra/examples/BASH/yum_start.sh   |    1 +
 doc/modules/cassandra/examples/BASH/yum_update.sh  |    1 +
 doc/modules/cassandra/examples/BNF/alter_ks.bnf    |    2 +
 .../cassandra/examples/BNF/alter_mv_statement.bnf  |    1 +
 .../examples/BNF/alter_role_statement.bnf          |    1 +
 doc/modules/cassandra/examples/BNF/alter_table.bnf |    4 +
 .../cassandra/examples/BNF/alter_udt_statement.bnf |    3 +
 .../examples/BNF/alter_user_statement.bnf          |    1 +
 .../cassandra/examples/BNF/batch_statement.bnf     |    5 +
 .../cassandra/examples/BNF/collection_literal.bnf  |    4 +
 .../cassandra/examples/BNF/collection_type.bnf     |    3 +
 doc/modules/cassandra/examples/BNF/column.bnf      |    1 +
 doc/modules/cassandra/examples/BNF/constant.bnf    |    8 +
 .../cassandra/examples/BNF/cql_statement.bnf       |   48 +
 doc/modules/cassandra/examples/BNF/cql_type.bnf    |    1 +
 .../examples/BNF/create_aggregate_statement.bnf    |    6 +
 .../examples/BNF/create_function_statement.bnf     |    6 +
 .../examples/BNF/create_index_statement.bnf        |    5 +
 doc/modules/cassandra/examples/BNF/create_ks.bnf   |    2 +
 .../cassandra/examples/BNF/create_mv_statement.bnf |    4 +
 .../examples/BNF/create_role_statement.bnf         |    9 +
 .../cassandra/examples/BNF/create_table.bnf        |   12 +
 .../examples/BNF/create_trigger_statement.bnf      |    3 +
 doc/modules/cassandra/examples/BNF/create_type.bnf |    3 +
 .../examples/BNF/create_user_statement.bnf         |    4 +
 doc/modules/cassandra/examples/BNF/custom_type.bnf |    1 +
 .../cassandra/examples/BNF/delete_statement.bnf    |    5 +
 .../examples/BNF/drop_aggregate_statement.bnf      |    2 +
 .../examples/BNF/drop_function_statement.bnf       |    2 +
 .../examples/BNF/drop_index_statement.bnf          |    1 +
 doc/modules/cassandra/examples/BNF/drop_ks.bnf     |    1 +
 .../cassandra/examples/BNF/drop_mv_statement.bnf   |    1 +
 .../cassandra/examples/BNF/drop_role_statement.bnf |    1 +
 doc/modules/cassandra/examples/BNF/drop_table.bnf  |    1 +
 .../examples/BNF/drop_trigger_statement.bnf        |    1 +
 .../cassandra/examples/BNF/drop_udt_statement.bnf  |    1 +
 .../cassandra/examples/BNF/drop_user_statement.bnf |    1 +
 doc/modules/cassandra/examples/BNF/function.bnf    |    1 +
 .../examples/BNF/grant_permission_statement.bnf    |   12 +
 .../examples/BNF/grant_role_statement.bnf          |    1 +
 doc/modules/cassandra/examples/BNF/identifier.bnf  |    3 +
 doc/modules/cassandra/examples/BNF/index_name.bnf  |    1 +
 .../cassandra/examples/BNF/insert_statement.bnf    |    6 +
 doc/modules/cassandra/examples/BNF/ks_table.bnf    |    5 +
 .../examples/BNF/list_permissions_statement.bnf    |    1 +
 .../examples/BNF/list_roles_statement.bnf          |    1 +
 .../examples/BNF/list_users_statement.bnf          |    1 +
 doc/modules/cassandra/examples/BNF/native_type.bnf |    4 +
 doc/modules/cassandra/examples/BNF/options.bnf     |    4 +
 .../examples/BNF/revoke_permission_statement.bnf   |    1 +
 .../examples/BNF/revoke_role_statement.bnf         |    1 +
 doc/modules/cassandra/examples/BNF/role_name.bnf   |    1 +
 .../cassandra/examples/BNF/select_statement.bnf    |   21 +
 doc/modules/cassandra/examples/BNF/term.bnf        |    6 +
 .../cassandra/examples/BNF/trigger_name.bnf        |    1 +
 .../cassandra/examples/BNF/truncate_table.bnf      |    1 +
 doc/modules/cassandra/examples/BNF/tuple.bnf       |    2 +
 doc/modules/cassandra/examples/BNF/udt.bnf         |    2 +
 doc/modules/cassandra/examples/BNF/udt_literal.bnf |    1 +
 .../cassandra/examples/BNF/update_statement.bnf    |   13 +
 doc/modules/cassandra/examples/BNF/use_ks.bnf      |    1 +
 doc/modules/cassandra/examples/BNF/view_name.bnf   |    1 +
 .../cassandra/examples/CQL/allow_filtering.cql     |    9 +
 doc/modules/cassandra/examples/CQL/alter_ks.cql    |    2 +
 doc/modules/cassandra/examples/CQL/alter_role.cql  |    1 +
 .../examples/CQL/alter_table_add_column.cql        |    1 +
 .../examples/CQL/alter_table_spec_retry.cql        |    1 +
 .../CQL/alter_table_spec_retry_percent.cql         |    1 +
 .../examples/CQL/alter_table_with_comment.cql      |    2 +
 doc/modules/cassandra/examples/CQL/alter_user.cql  |    2 +
 doc/modules/cassandra/examples/CQL/as.cql          |   13 +
 .../examples/CQL/autoexpand_exclude_dc.cql         |    4 +
 .../cassandra/examples/CQL/autoexpand_ks.cql       |    4 +
 .../examples/CQL/autoexpand_ks_override.cql        |    4 +
 doc/modules/cassandra/examples/CQL/avg.cql         |    1 +
 .../cassandra/examples/CQL/batch_statement.cql     |    6 +
 .../cassandra/examples/CQL/caching_option.cql      |    6 +
 .../cassandra/examples/CQL/chunk_length.cql        |    6 +
 doc/modules/cassandra/examples/CQL/count.cql       |    2 +
 .../cassandra/examples/CQL/count_nonnull.cql       |    1 +
 .../cassandra/examples/CQL/create_function.cql     |   15 +
 .../cassandra/examples/CQL/create_index.cql        |    8 +
 doc/modules/cassandra/examples/CQL/create_ks.cql   |    6 +
 .../cassandra/examples/CQL/create_ks2_backup.cql   |    2 +
 .../cassandra/examples/CQL/create_ks_backup.cql    |    2 +
 .../examples/CQL/create_ks_trans_repl.cql          |    2 +
 .../cassandra/examples/CQL/create_mv_statement.cql |    5 +
 doc/modules/cassandra/examples/CQL/create_role.cql |    6 +
 .../examples/CQL/create_role_ifnotexists.cql       |    2 +
 .../examples/CQL/create_static_column.cql          |    7 +
 .../cassandra/examples/CQL/create_table.cql        |   23 +
 .../examples/CQL/create_table2_backup.cql          |   14 +
 .../cassandra/examples/CQL/create_table_backup.cql |   13 +
 .../examples/CQL/create_table_clustercolumn.cql    |    7 +
 .../examples/CQL/create_table_compound_pk.cql      |    7 +
 .../cassandra/examples/CQL/create_table_simple.cql |    4 +
 .../examples/CQL/create_table_single_pk.cql        |    1 +
 .../cassandra/examples/CQL/create_trigger.cql      |    1 +
 doc/modules/cassandra/examples/CQL/create_user.cql |    2 +
 .../cassandra/examples/CQL/create_user_role.cql    |   14 +
 doc/modules/cassandra/examples/CQL/currentdate.cql |    1 +
 .../cassandra/examples/CQL/datetime_arithmetic.cql |    1 +
 .../examples/CQL/delete_all_elements_list.cql      |    1 +
 .../cassandra/examples/CQL/delete_element_list.cql |    1 +
 doc/modules/cassandra/examples/CQL/delete_map.cql  |    2 +
 doc/modules/cassandra/examples/CQL/delete_set.cql  |    1 +
 .../cassandra/examples/CQL/delete_statement.cql    |    5 +
 .../cassandra/examples/CQL/drop_aggregate.cql      |    4 +
 .../cassandra/examples/CQL/drop_function.cql       |    4 +
 doc/modules/cassandra/examples/CQL/drop_ks.cql     |    1 +
 .../cassandra/examples/CQL/drop_trigger.cql        |    1 +
 .../cassandra/examples/CQL/function_dollarsign.cql |   15 +
 .../cassandra/examples/CQL/function_overload.cql   |    2 +
 .../cassandra/examples/CQL/function_udfcontext.cql |   11 +
 .../cassandra/examples/CQL/grant_describe.cql      |    1 +
 doc/modules/cassandra/examples/CQL/grant_drop.cql  |    1 +
 .../cassandra/examples/CQL/grant_execute.cql       |    1 +
 .../cassandra/examples/CQL/grant_modify.cql        |    1 +
 doc/modules/cassandra/examples/CQL/grant_perm.cql  |    1 +
 doc/modules/cassandra/examples/CQL/grant_role.cql  |    1 +
 .../cassandra/examples/CQL/insert_data2_backup.cql |    5 +
 .../cassandra/examples/CQL/insert_data_backup.cql  |    6 +
 .../cassandra/examples/CQL/insert_duration.cql     |    6 +
 doc/modules/cassandra/examples/CQL/insert_json.cql |    1 +
 .../cassandra/examples/CQL/insert_statement.cql    |    5 +
 .../cassandra/examples/CQL/insert_static_data.cql  |    2 +
 .../examples/CQL/insert_table_cc_addl.cql          |    1 +
 .../examples/CQL/insert_table_clustercolumn.cql    |    5 +
 .../examples/CQL/insert_table_clustercolumn2.cql   |    5 +
 .../examples/CQL/insert_table_compound_pk.cql      |    5 +
 doc/modules/cassandra/examples/CQL/insert_udt.cql  |   17 +
 doc/modules/cassandra/examples/CQL/list.cql        |   12 +
 .../cassandra/examples/CQL/list_all_perm.cql       |    1 +
 doc/modules/cassandra/examples/CQL/list_perm.cql   |    1 +
 doc/modules/cassandra/examples/CQL/list_roles.cql  |    1 +
 .../examples/CQL/list_roles_nonrecursive.cql       |    1 +
 .../cassandra/examples/CQL/list_roles_of.cql       |    1 +
 .../cassandra/examples/CQL/list_select_perm.cql    |    1 +
 doc/modules/cassandra/examples/CQL/map.cql         |   11 +
 doc/modules/cassandra/examples/CQL/min_max.cql     |    1 +
 .../cassandra/examples/CQL/mv_table_def.cql        |    8 +
 .../cassandra/examples/CQL/mv_table_error.cql      |   13 +
 .../cassandra/examples/CQL/mv_table_from_base.cql  |    9 +
 doc/modules/cassandra/examples/CQL/no_revoke.cql   |    5 +
 .../examples/CQL/query_allow_filtering.cql         |    5 +
 .../examples/CQL/query_fail_allow_filtering.cql    |    1 +
 .../examples/CQL/query_nofail_allow_filtering.cql  |    1 +
 .../cassandra/examples/CQL/rename_udt_field.cql    |    1 +
 doc/modules/cassandra/examples/CQL/revoke_perm.cql |    5 +
 doc/modules/cassandra/examples/CQL/revoke_role.cql |    1 +
 doc/modules/cassandra/examples/CQL/role_error.cql  |    6 +
 .../cassandra/examples/CQL/select_data2_backup.cql |    2 +
 .../cassandra/examples/CQL/select_data_backup.cql  |    2 +
 .../cassandra/examples/CQL/select_range.cql        |    1 +
 .../cassandra/examples/CQL/select_statement.cql    |   11 +
 .../cassandra/examples/CQL/select_static_data.cql  |    1 +
 .../examples/CQL/select_table_clustercolumn.cql    |    1 +
 .../examples/CQL/select_table_compound_pk.cql      |    1 +
 doc/modules/cassandra/examples/CQL/set.cql         |   11 +
 .../cassandra/examples/CQL/spec_retry_values.cql   |    6 +
 doc/modules/cassandra/examples/CQL/sum.cql         |    1 +
 .../cassandra/examples/CQL/table_for_where.cql     |    9 +
 .../cassandra/examples/CQL/timeuuid_min_max.cql    |    3 +
 .../cassandra/examples/CQL/timeuuid_now.cql        |    1 +
 doc/modules/cassandra/examples/CQL/token.cql       |    2 +
 doc/modules/cassandra/examples/CQL/tuple.cql       |    6 +
 doc/modules/cassandra/examples/CQL/uda.cql         |   41 +
 doc/modules/cassandra/examples/CQL/udt.cql         |   16 +
 doc/modules/cassandra/examples/CQL/update_list.cql |    2 +
 doc/modules/cassandra/examples/CQL/update_map.cql  |    2 +
 .../CQL/update_particular_list_element.cql         |    1 +
 doc/modules/cassandra/examples/CQL/update_set.cql  |    1 +
 .../cassandra/examples/CQL/update_statement.cql    |   10 +
 .../cassandra/examples/CQL/update_ttl_map.cql      |    1 +
 doc/modules/cassandra/examples/CQL/use_ks.cql      |    1 +
 doc/modules/cassandra/examples/CQL/where.cql       |    4 +
 doc/modules/cassandra/examples/CQL/where_fail.cql  |    5 +
 .../examples/CQL/where_group_cluster_columns.cql   |    3 +
 .../cassandra/examples/CQL/where_in_tuple.cql      |    3 +
 .../CQL/where_no_group_cluster_columns.cql         |    4 +
 .../cassandra/examples/JAVA/udf_imports.java       |    8 +
 .../cassandra/examples/JAVA/udfcontext.java        |   11 +
 .../examples/RESULTS/add_repo_keys.result          |    4 +
 .../cassandra/examples/RESULTS/add_yum_repo.result |    6 +
 .../examples/RESULTS/autoexpand_exclude_dc.result  |    1 +
 .../examples/RESULTS/autoexpand_ks.result          |    1 +
 .../examples/RESULTS/autoexpand_ks_override.result |    1 +
 .../examples/RESULTS/cqlsh_localhost.result        |   11 +
 .../cassandra/examples/RESULTS/find_backups.result |    4 +
 .../examples/RESULTS/find_backups_table.result     |    1 +
 .../examples/RESULTS/find_two_snapshots.result     |    3 +
 .../examples/RESULTS/flush_and_check.result        |    9 +
 .../examples/RESULTS/flush_and_check2.result       |   17 +
 .../examples/RESULTS/insert_data2_backup.result    |   13 +
 .../examples/RESULTS/insert_table_cc_addl.result   |    9 +
 .../cassandra/examples/RESULTS/java_verify.result  |    3 +
 .../cassandra/examples/RESULTS/no_bups.result      |    1 +
 .../RESULTS/nodetool_list_snapshots.result         |   13 +
 .../examples/RESULTS/nodetool_snapshot_help.result |   54 +
 .../examples/RESULTS/select_data2_backup.result    |   13 +
 .../examples/RESULTS/select_data_backup.result     |   15 +
 .../cassandra/examples/RESULTS/select_range.result |    6 +
 .../examples/RESULTS/select_static_data.result     |    4 +
 .../RESULTS/select_table_clustercolumn.result      |    9 +
 .../RESULTS/select_table_compound_pk.result        |    9 +
 .../cassandra/examples/RESULTS/snapshot_all.result |    4 +
 .../examples/RESULTS/snapshot_backup2.result       |    3 +
 .../examples/RESULTS/snapshot_backup2_find.result  |    2 +
 .../examples/RESULTS/snapshot_files.result         |   11 +
 .../examples/RESULTS/snapshot_mult_ks.result       |    3 +
 .../examples/RESULTS/snapshot_mult_tables.result   |    3 +
 .../RESULTS/snapshot_mult_tables_again.result      |    3 +
 .../examples/RESULTS/snapshot_one_table2.result    |    3 +
 .../cassandra/examples/RESULTS/tail_syslog.result  |    1 +
 .../cassandra/examples/RESULTS/verify_gpg.result   |    2 +
 .../examples/TEXT/tarball_install_dirs.txt         |   11 +
 .../cassandra/examples/YAML/auto_snapshot.yaml     |    1 +
 .../cassandra/examples/YAML/incremental_bups.yaml  |    1 +
 .../examples/YAML/snapshot_before_compaction.yaml  |    1 +
 .../cassandra/examples/YAML}/stress-example.yaml   |   18 -
 .../examples/YAML}/stress-lwt-example.yaml         |   18 -
 doc/modules/cassandra/nav.adoc                     |  106 +
 .../cassandra/pages/architecture/dynamo.adoc       |  531 +++
 .../cassandra/pages/architecture/guarantees.adoc   |  108 +
 .../cassandra/pages}/architecture/images/ring.svg  |    0
 .../pages}/architecture/images/vnodes.svg          |    0
 .../cassandra/pages/architecture/index.adoc        |    9 +
 .../cassandra/pages/architecture/overview.adoc     |  101 +
 .../cassandra/pages/architecture/snitch.adoc       |   74 +
 .../pages/architecture/storage_engine.adoc         |  225 ++
 .../pages/configuration/cass_cl_archive_file.adoc  |   48 +
 .../pages/configuration/cass_env_sh_file.adoc      |  162 +
 .../pages/configuration/cass_jvm_options_file.adoc |   22 +
 .../pages/configuration/cass_logback_xml_file.adoc |  166 +
 .../pages/configuration/cass_rackdc_file.adoc      |   79 +
 .../pages/configuration/cass_topo_file.adoc        |   53 +
 .../cassandra/pages/configuration/index.adoc       |   11 +
 doc/modules/cassandra/pages/cql/SASI.adoc          |  809 ++++
 doc/modules/cassandra/pages/cql/appendices.adoc    |  179 +
 doc/modules/cassandra/pages/cql/changes.adoc       |  215 ++
 .../cassandra/pages/cql/cql_singlefile.adoc        | 3904 ++++++++++++++++++++
 doc/modules/cassandra/pages/cql/ddl.adoc           |  799 ++++
 doc/modules/cassandra/pages/cql/definitions.adoc   |  187 +
 doc/modules/cassandra/pages/cql/dml.adoc           |  458 +++
 doc/modules/cassandra/pages/cql/functions.adoc     |  504 +++
 doc/modules/cassandra/pages/cql/index.adoc         |   24 +
 doc/modules/cassandra/pages/cql/indexes.adoc       |   63 +
 doc/modules/cassandra/pages/cql/json.adoc          |  125 +
 doc/modules/cassandra/pages/cql/mvs.adoc           |  158 +
 doc/modules/cassandra/pages/cql/operators.adoc     |   68 +
 doc/modules/cassandra/pages/cql/security.adoc      |  611 +++
 doc/modules/cassandra/pages/cql/triggers.adoc      |   50 +
 doc/modules/cassandra/pages/cql/types.adoc         |  539 +++
 .../data_modeling/data_modeling_conceptual.adoc}   |   43 +-
 .../pages/data_modeling/data_modeling_logical.adoc |  195 +
 .../data_modeling/data_modeling_physical.adoc      |   96 +
 .../pages/data_modeling/data_modeling_queries.adoc |   60 +
 .../pages/data_modeling/data_modeling_rdbms.adoc}  |   77 +-
 .../data_modeling/data_modeling_refining.adoc      |  201 +
 .../pages/data_modeling/data_modeling_schema.adoc  |  130 +
 .../pages/data_modeling/data_modeling_tools.adoc   |   44 +
 .../data_modeling/images/Figure_1_data_model.jpg   |  Bin
 .../data_modeling/images/Figure_2_data_model.jpg   |  Bin
 .../images/data_modeling_chebotko_logical.png      |  Bin
 .../images/data_modeling_chebotko_physical.png     |  Bin
 .../images/data_modeling_hotel_bucketing.png       |  Bin
 .../images/data_modeling_hotel_erd.png             |  Bin
 .../images/data_modeling_hotel_logical.png         |  Bin
 .../images/data_modeling_hotel_physical.png        |  Bin
 .../images/data_modeling_hotel_queries.png         |  Bin
 .../images/data_modeling_hotel_relational.png      |  Bin
 .../images/data_modeling_reservation_logical.png   |  Bin
 .../images/data_modeling_reservation_physical.png  |  Bin
 .../cassandra/pages/data_modeling/index.adoc       |   11 +
 .../cassandra/pages/data_modeling/intro.adoc       |  220 ++
 doc/modules/cassandra/pages/faq/index.adoc         |  290 ++
 .../pages/getting_started/configuring.adoc         |   84 +
 .../cassandra/pages/getting_started/drivers.adoc   |   90 +
 .../cassandra/pages/getting_started/index.adoc     |   30 +
 .../pages/getting_started/installing.adoc          |  344 ++
 .../pages/getting_started/production.adoc          |  163 +
 .../cassandra/pages/getting_started/querying.adoc  |   31 +
 .../pages/getting_started/quickstart.adoc          |  116 +
 .../cassandra/pages}/new/Figure_1.jpg              |  Bin
 .../cassandra/pages}/new/Figure_2.jpg              |  Bin
 doc/modules/cassandra/pages/new/auditlogging.adoc  |  464 +++
 .../cassandra/pages/new/fqllogging.adoc}           |  390 +-
 doc/modules/cassandra/pages/new/index.adoc         |   11 +
 doc/modules/cassandra/pages/new/java11.adoc        |  292 ++
 doc/modules/cassandra/pages/new/messaging.adoc     |  360 ++
 doc/modules/cassandra/pages/new/streaming.adoc     |  217 ++
 .../cassandra/pages/new/transientreplication.adoc  |  186 +
 doc/modules/cassandra/pages/new/virtualtables.adoc |  410 ++
 .../cassandra/pages/operating/audit_logging.adoc   |  224 ++
 doc/modules/cassandra/pages/operating/backups.adoc |  517 +++
 .../cassandra/pages/operating/bloom_filters.adoc   |   64 +
 .../cassandra/pages/operating/bulk_loading.adoc    |  842 +++++
 doc/modules/cassandra/pages/operating/cdc.adoc     |   86 +
 .../pages/operating/compaction/index.adoc          |  339 ++
 .../cassandra/pages/operating/compaction/lcs.adoc  |   81 +
 .../cassandra/pages/operating/compaction/stcs.adoc |   42 +
 .../cassandra/pages/operating/compaction/twcs.adoc |   75 +
 .../cassandra/pages/operating/compression.adoc     |  187 +
 .../cassandra/pages/operating/hardware.adoc        |  100 +
 doc/modules/cassandra/pages/operating/hints.adoc   |  248 ++
 doc/modules/cassandra/pages/operating/index.adoc   |   15 +
 doc/modules/cassandra/pages/operating/metrics.adoc | 1088 ++++++
 .../cassandra/pages/operating/read_repair.adoc     |  264 ++
 doc/modules/cassandra/pages/operating/repair.adoc  |  222 ++
 .../cassandra/pages/operating/security.adoc        |  527 +++
 .../cassandra/pages/operating/topo_changes.adoc    |  133 +
 doc/modules/cassandra/pages/plugins/index.adoc     |   36 +
 .../cassandra/pages/tools/cassandra_stress.adoc    |  326 ++
 doc/modules/cassandra/pages/tools/cqlsh.adoc       |  482 +++
 doc/modules/cassandra/pages/tools/index.adoc       |    9 +
 .../cassandra/pages/tools/sstable/index.adoc       |   20 +
 .../cassandra/pages/tools/sstable/sstabledump.adoc |  286 ++
 .../tools/sstable/sstableexpiredblockers.adoc      |   42 +
 .../pages/tools/sstable/sstablelevelreset.adoc     |   69 +
 .../pages/tools/sstable/sstableloader.adoc         |  316 ++
 .../pages/tools/sstable/sstablemetadata.adoc       |  320 ++
 .../pages/tools/sstable/sstableofflinerelevel.adoc |   94 +
 .../pages/tools/sstable/sstablerepairedset.adoc    |   83 +
 .../pages/tools/sstable/sstablescrub.adoc          |  102 +
 .../pages/tools/sstable/sstablesplit.adoc          |   96 +
 .../pages/tools/sstable/sstableupgrade.adoc        |  136 +
 .../cassandra/pages/tools/sstable/sstableutil.adoc |  102 +
 .../pages/tools/sstable/sstableverify.adoc         |   82 +
 .../pages/troubleshooting/finding_nodes.adoc       |  133 +
 .../cassandra/pages/troubleshooting/index.adoc     |   19 +
 .../pages/troubleshooting/reading_logs.adoc        |  247 ++
 .../pages/troubleshooting/use_nodetool.adoc        |  242 ++
 .../cassandra/pages/troubleshooting/use_tools.adoc |  578 +++
 doc/modules/cassandra/partials/java_version.adoc   |   23 +
 .../cassandra/partials/nodetool_and_cqlsh.adoc     |   21 +
 .../partials/nodetool_and_cqlsh_nobin.adoc         |   21 +
 .../cassandra/partials/package_versions.adoc       |    5 +
 doc/modules/cassandra/partials/tail_syslog.adoc    |   25 +
 .../convert_yaml_to_adoc.py}                       |   23 +-
 doc/{ => scripts}/gen-nodetool-docs.py             |   27 +-
 doc/source/_static/extra.css                       |   76 -
 doc/source/_templates/indexcontent.html            |  100 -
 doc/source/_theme/cassandra_theme/defindex.html    |   40 -
 doc/source/_theme/cassandra_theme/layout.html      |  108 -
 doc/source/_theme/cassandra_theme/search.html      |   67 -
 doc/source/_theme/cassandra_theme/theme.conf       |    3 -
 doc/source/_util/cql.py                            |  283 --
 doc/source/architecture/dynamo.rst                 |  537 ---
 doc/source/architecture/guarantees.rst             |   76 -
 doc/source/architecture/index.rst                  |   29 -
 doc/source/architecture/overview.rst               |  114 -
 doc/source/architecture/storage_engine.rst         |  208 --
 doc/source/bugs.rst                                |   30 -
 doc/source/conf.py                                 |  441 ---
 doc/source/configuration/cass_cl_archive_file.rst  |   46 -
 doc/source/configuration/cass_env_sh_file.rst      |  128 -
 doc/source/configuration/cass_jvm_options_file.rst |   10 -
 doc/source/configuration/cass_logback_xml_file.rst |  157 -
 doc/source/configuration/cass_rackdc_file.rst      |   67 -
 doc/source/configuration/cass_topo_file.rst        |   48 -
 doc/source/configuration/cass_yaml_file.rst        | 2124 -----------
 doc/source/configuration/index.rst                 |   31 -
 doc/source/contactus.rst                           |   50 -
 doc/source/cql/appendices.rst                      |  333 --
 doc/source/cql/changes.rst                         |  211 --
 doc/source/cql/ddl.rst                             | 1186 ------
 doc/source/cql/definitions.rst                     |  236 --
 doc/source/cql/dml.rst                             |  522 ---
 doc/source/cql/functions.rst                       |  581 ---
 doc/source/cql/index.rst                           |   47 -
 doc/source/cql/indexes.rst                         |   83 -
 doc/source/cql/json.rst                            |  115 -
 doc/source/cql/mvs.rst                             |  179 -
 doc/source/cql/operators.rst                       |   74 -
 doc/source/cql/security.rst                        |  538 ---
 doc/source/cql/triggers.rst                        |   63 -
 doc/source/cql/types.rst                           |  603 ---
 doc/source/data_modeling/data_modeling_logical.rst |  219 --
 .../data_modeling/data_modeling_physical.rst       |  117 -
 doc/source/data_modeling/data_modeling_queries.rst |   85 -
 .../data_modeling/data_modeling_refining.rst       |  218 --
 doc/source/data_modeling/data_modeling_schema.rst  |  144 -
 doc/source/data_modeling/data_modeling_tools.rst   |   64 -
 doc/source/data_modeling/index.rst                 |   36 -
 doc/source/data_modeling/intro.rst                 |  146 -
 doc/source/development/ci.rst                      |   84 -
 doc/source/development/code_style.rst              |   93 -
 doc/source/development/dependencies.rst            |   53 -
 doc/source/development/documentation.rst           |  104 -
 doc/source/development/gettingstarted.rst          |   60 -
 doc/source/development/how_to_commit.rst           |  151 -
 doc/source/development/how_to_review.rst           |   73 -
 doc/source/development/ide.rst                     |  185 -
 doc/source/development/index.rst                   |   34 -
 doc/source/development/patches.rst                 |  141 -
 doc/source/development/release_process.rst         |  270 --
 doc/source/development/testing.rst                 |  179 -
 doc/source/faq/index.rst                           |  299 --
 doc/source/getting_started/configuring.rst         |   80 -
 doc/source/getting_started/drivers.rst             |  123 -
 doc/source/getting_started/index.rst               |   34 -
 doc/source/getting_started/installing.rst          |  324 --
 doc/source/getting_started/production.rst          |  156 -
 doc/source/getting_started/querying.rst            |   52 -
 doc/source/glossary.rst                            |   35 -
 doc/source/index.rst                               |   43 -
 doc/source/new/auditlogging.rst                    |  510 ---
 doc/source/new/index.rst                           |   32 -
 doc/source/new/java11.rst                          |  274 --
 doc/source/new/messaging.rst                       |  257 --
 doc/source/new/streaming.rst                       |  167 -
 doc/source/new/transientreplication.rst            |  155 -
 doc/source/new/virtualtables.rst                   |  407 --
 doc/source/operating/backups.rst                   |  660 ----
 doc/source/operating/bloom_filters.rst             |   65 -
 doc/source/operating/bulk_loading.rst              |  660 ----
 doc/source/operating/cdc.rst                       |   96 -
 doc/source/operating/compaction/index.rst          |  301 --
 doc/source/operating/compaction/lcs.rst            |   91 -
 doc/source/operating/compaction/stcs.rst           |   58 -
 doc/source/operating/compaction/twcs.rst           |   76 -
 doc/source/operating/compression.rst               |  164 -
 doc/source/operating/denylisting_partitions.rst    |  110 -
 doc/source/operating/error_codes.txt               |   31 -
 doc/source/operating/hardware.rst                  |   85 -
 doc/source/operating/hints.rst                     |  279 --
 doc/source/operating/index.rst                     |   40 -
 doc/source/operating/metrics.rst                   |  888 -----
 doc/source/operating/read_repair.rst               |  169 -
 doc/source/operating/repair.rst                    |  208 --
 doc/source/operating/security.rst                  |  468 ---
 doc/source/operating/snitch.rst                    |   82 -
 doc/source/operating/topo_changes.rst              |  129 -
 doc/source/plugins/index.rst                       |   35 -
 doc/source/tools/cassandra_stress.rst              |  273 --
 doc/source/tools/cqlsh.rst                         |  472 ---
 doc/source/tools/index.rst                         |   29 -
 doc/source/tools/sstable/index.rst                 |   39 -
 doc/source/tools/sstable/sstabledump.rst           |  316 --
 .../tools/sstable/sstableexpiredblockers.rst       |   48 -
 doc/source/tools/sstable/sstablelevelreset.rst     |   82 -
 doc/source/tools/sstable/sstableloader.rst         |  273 --
 doc/source/tools/sstable/sstablemetadata.rst       |  304 --
 doc/source/tools/sstable/sstableofflinerelevel.rst |   95 -
 doc/source/tools/sstable/sstablerepairedset.rst    |   79 -
 doc/source/tools/sstable/sstablescrub.rst          |  100 -
 doc/source/tools/sstable/sstablesplit.rst          |   93 -
 doc/source/tools/sstable/sstableupgrade.rst        |  137 -
 doc/source/tools/sstable/sstableutil.rst           |   91 -
 doc/source/tools/sstable/sstableverify.rst         |   91 -
 doc/source/troubleshooting/finding_nodes.rst       |  149 -
 doc/source/troubleshooting/index.rst               |   39 -
 doc/source/troubleshooting/reading_logs.rst        |  267 --
 doc/source/troubleshooting/use_nodetool.rst        |  245 --
 doc/source/troubleshooting/use_tools.rst           |  542 ---
 547 files changed, 24873 insertions(+), 24451 deletions(-)

diff --cc doc/antora.yml
index 0000000,771311b..f9fa148
mode 000000,100644..100644
--- a/doc/antora.yml
+++ b/doc/antora.yml
@@@ -1,0 -1,9 +1,9 @@@
+ name: Cassandra
 -version: '4.0'
 -display_version: '4.0'
++version: 'trunk'
++display_version: 'trunk'
+ asciidoc:
+   attributes:
+     cass_url: 'http://cassandra.apache.org/'
+ nav:
+ - modules/ROOT/nav.adoc
+ - modules/cassandra/nav.adoc

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to