This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 03f0d37cb0120625db25d0aec52bbc6b49c3982c
Merge: 89e33a16ea 8fd44ca8fc
Author: Andrés de la Peña <a.penya.gar...@gmail.com>
AuthorDate: Fri Jan 19 17:33:55 2024 +0000
Merge branch 'cassandra-5.0' into trunk
.build/build-resolver.xml | 2 -
.build/docker/run-tests.sh | 4 +-
.build/docker/ubuntu2004_test.docker | 24 +-
.build/run-python-dtests.sh | 2 +-
.circleci/config.yml | 877 ++------------------
.circleci/config.yml.FREE | 877 ++------------------
.circleci/config.yml.PAID | 879 ++-------------------
.circleci/config_template.yml | 170 +---
.circleci/config_template.yml.PAID.patch | 104 +--
CHANGES.txt | 1 +
NEWS.txt | 4 +-
bin/cqlsh | 6 +-
bin/cqlsh.py | 6 +-
.../cassandra/pages/installing/installing.adoc | 2 +-
lib/cassandra-driver-internal-only-3.28.0.zip | Bin 356837 -> 0 bytes
lib/cassandra-driver-internal-only-3.29.0.zip | Bin 0 -> 396496 bytes
pylib/Dockerfile.ubuntu.py3 | 2 +-
...kerfile.ubuntu.py37 => Dockerfile.ubuntu.py311} | 2 +-
pylib/README.asc | 2 +-
pylib/cassandra-cqlsh-tests.sh | 2 +-
pylib/cqlshlib/test/run_cqlsh.py | 2 +-
pylib/requirements.txt | 2 +-
22 files changed, 298 insertions(+), 2672 deletions(-)
diff --cc .circleci/config_template.yml.PAID.patch
index 422dddc650,a07902b350..8b4da040d0
--- a/.circleci/config_template.yml.PAID.patch
+++ b/.circleci/config_template.yml.PAID.patch
@@@ -1,5 -1,5 +1,5 @@@
- --- config_template.yml 2023-11-10 16:50:30.517080584 +0000
- +++ config_template.yml.PAID 2023-11-10 16:51:58.403988884 +0000
---- config_template.yml 2024-01-05 00:32:24.148600479 +0000
-+++ config_template.yml.PAID 2024-01-05 00:32:40.861079981 +0000
++--- config_template.yml 2024-01-05 12:06:28.009687781 +0000
+++++ config_template.yml.PAID 2024-01-05 12:09:25.083221646 +0000
@@ -157,20 +157,20 @@
j11_par_executor: &j11_par_executor
executor:
diff --cc CHANGES.txt
index d1ed33baee,336edfb09f..565b1d80b6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
-5.0-beta2
+5.1
+ * Limit cassandra startup to supported JDKs, allow higher JDKs by setting
CASSANDRA_JDK_UNSUPPORTED (CASSANDRA-18688)
+ * Standardize nodetool tablestats formatting of data units (CASSANDRA-19104)
+ * Make nodetool tablestats use number of significant digits for time and
average values consistently (CASSANDRA-19015)
+ * Upgrade jackson to 2.15.3 and snakeyaml to 2.1 (CASSANDRA-18875)
+ * Transactional Cluster Metadata [CEP-21] (CASSANDRA-18330)
+ * Add ELAPSED command to cqlsh (CASSANDRA-18861)
+ * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781)
+ * Clean up obsolete functions and simplify cql_version handling in cqlsh
(CASSANDRA-18787)
+Merged from 5.0:
+ * Upgrade Python driver to 3.29.0 (CASSANDRA-19245)
* Creating a SASI index after creating an SAI index does not break secondary
index queries (CASSANDRA-18939)
* Optionally fail when a non-partition-restricted query is issued against an
index (CASSANDRA-18796)
* Add a startup check to fail startup when using invalid configuration with
certain Kernel and FS type (CASSANDRA-19196)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
