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 c62de1b248ee5cae00e9f2476adefe778ceb7e69
Merge: 753f81d53a 709ae29fd8
Author: Mick Semb Wever <[email protected]>
AuthorDate: Fri Nov 10 10:36:34 2023 +0100

    Merge branch 'cassandra-5.0' into trunk
    
    * cassandra-5.0:
      Docs: Fix vsearch missing files

 .../cassandra/examples/CQL/comments-table.cql      | 104 +++++
 .../cassandra/examples/CQL/country_flag-table.cql  |  84 ++++
 .../cassandra/examples/CQL/cyclist_base-table.cql  |  84 ++++
 .../examples/CQL/cyclist_category-table.cql        | 118 +++++
 .../examples/CQL/cyclist_emails-table.cql          |  35 ++
 .../examples/CQL/cyclist_expenses-table.cql        | 216 +++++++++
 .../cassandra/examples/CQL/cyclist_id-table.cql    |  77 ++++
 .../cassandra/examples/CQL/cyclist_name-table.cql  | 486 +++++++++++++++++++++
 .../cassandra/examples/CQL/cyclist_races-table.cql |  62 +++
 .../cassandra/examples/CQL/popular_count-table.cql |  42 ++
 .../cassandra/examples/CQL/race_times-table.cql    |  43 ++
 .../cassandra/examples/CQL/race_winners-table.cql  |  73 ++++
 .../examples/CQL/rank_by_year_and_name-table.cql   | 136 ++++++
 .../examples/CQLSH/comments-desc_table.cqlsh       |   1 +
 .../examples/RESULTS/comments-desc_table.result    |  21 +
 ...t_after_batch_food_from_cyclist_expenses.result |   7 +
 ...t_after_batch_paid_from_cyclist_expenses.result |   7 +
 ...elect_after_update_from_cyclist_expenses.result |   5 +
 .../select_initial_from_country_flag.result        |   8 +
 .../select_initial_from_cyclist_expenses.result    |   5 +
 doc/modules/cassandra/examples/RESULTS/true.result |   3 +
 doc/modules/cassandra/nav.adoc                     |  10 +-
 doc/modules/cassandra/pages/new/index.adoc         |  10 +-
 .../pages/reference/cql-commands/create-index.adoc |   9 +-
 .../cql-commands/create-table-examples.adoc        |  98 +++++
 .../pages/reference/cql-commands/create-table.adoc |  95 ++++
 .../pages/reference/cql-commands/drop-table.adoc   |  52 +++
 .../vector-search/_query-vector-data-cycling.adoc  |   8 +-
 .../cassandra/pages/vector-search/overview.adoc    |   6 +-
 .../vector-search/vector-search-working-with.adoc  |  13 +
 doc/modules/cassandra/partials/cluster-order.adoc  |  14 +
 .../cassandra/partials/compact-subproperties.adoc  | 262 +++++++++++
 .../cassandra/partials/compaction-strategies.adoc  |   9 +
 .../cassandra/partials/compress-subproperties.adoc |  69 +++
 .../cassandra/partials/primary-key-column.adoc     |  29 ++
 .../partials/single-partition-batch-note.adoc      |  10 +
 .../partials/table-column-definitions.adoc         |  29 ++
 .../cassandra/partials/table-properties.adoc       | 146 +++++++
 38 files changed, 2471 insertions(+), 15 deletions(-)

diff --cc doc/modules/cassandra/pages/new/index.adoc
index 9a173e5078,7cf4c41837..69837be3c5
--- a/doc/modules/cassandra/pages/new/index.adoc
+++ b/doc/modules/cassandra/pages/new/index.adoc
@@@ -1,6 -1,6 +1,14 @@@
  = New Features
  :navtitle: What's new
  
++== New Features in Apache Cassandra 5.1
++
++This section covers the new features in Apache Cassandra 5.1.
++
++* https://cwiki.apache.org/confluence/x/FQRACw[ACID Transactions (Accord)]
++* https://cwiki.apache.org/confluence/x/YyD1D[Transactional Cluster Metadata]
++
++
  == New Features in Apache Cassandra 5.0
  
  This section covers the new features in Apache Cassandra 5.0.


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to