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 a77951ec0c1919f6510e3ec9c4451e3124a19e92 Merge: c6cb8523b3 b91c0fcb6e Author: Andrés de la Peña <[email protected]> AuthorDate: Tue Nov 14 11:48:35 2023 +0000 Merge branch 'cassandra-5.0' into trunk .build/docker/ubuntu2004_test.docker | 2 +- .circleci/config.yml | 170 ++++++++++----------- .circleci/config.yml.FREE | 170 ++++++++++----------- .circleci/config.yml.PAID | 170 ++++++++++----------- .circleci/config_template.yml | 26 ++-- .circleci/config_template.yml.PAID.patch | 16 +- CHANGES.txt | 1 + NEWS.txt | 2 + bin/cqlsh | 4 +- bin/cqlsh.py | 4 +- .../cassandra/pages/installing/installing.adoc | 2 +- pylib/Dockerfile.ubuntu.py3 | 2 +- pylib/README.asc | 2 +- pylib/cassandra-cqlsh-tests.sh | 2 +- 14 files changed, 288 insertions(+), 285 deletions(-) diff --cc .circleci/config_template.yml.PAID.patch index 7ca86ce04f,53d3644476..422dddc650 --- a/.circleci/config_template.yml.PAID.patch +++ b/.circleci/config_template.yml.PAID.patch @@@ -1,5 -1,5 +1,5 @@@ - --- config_template.yml 2023-08-11 10:06:39.000000000 -0400 - +++ config_template.yml.PAID 2023-08-11 10:22:35.000000000 -0400 ---- config_template.yml 2023-11-10 15:39:02.663105186 +0000 -+++ config_template.yml.PAID 2023-11-10 15:39:24.839456426 +0000 ++--- config_template.yml 2023-11-10 16:50:30.517080584 +0000 +++++ config_template.yml.PAID 2023-11-10 16:51:58.403988884 +0000 @@ -157,20 +157,20 @@ j11_par_executor: &j11_par_executor executor: diff --cc CHANGES.txt index c77d936885,8988be9fda..bfa639fff2 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ -5.0-beta1 +5.1 + * 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: + * Make cqlsh's min required Python version 3.7+ instead of 3.6+ (CASSANDRA-18960) * Fix incorrect seeking through the sstable iterator by IndexState (CASSANDRA-18932) * Upgrade Python driver to 3.28.0 (CASSANDRA-18960) * Add retries to IR messages (CASSANDRA-18962) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
