This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit eca21d9aea7b3437368a10a9121fcd0b46805878 Merge: a978754 e2c3efe Author: Ekaterina Dimitrova <[email protected]> AuthorDate: Sat Jun 12 14:05:26 2021 -0400 Merge branch 'cassandra-4.0' into trunk CHANGES.txt | 1 + pylib/cqlshlib/sslhandling.py | 20 ++++-- pylib/cqlshlib/test/config/sslhandling.config | 2 + .../test/config/sslhandling_invalid.config | 2 + pylib/cqlshlib/test/test_sslhandling.py | 75 ++++++++++++++++++++++ 5 files changed, 95 insertions(+), 5 deletions(-) diff --cc CHANGES.txt index 8f74359,b3a5274..eb82434 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -25,9 -22,10 +25,10 @@@ Merged from 3.11 * Nodetool garbagecollect should retain SSTableLevel for LCS (CASSANDRA-16634) * Ignore stale acks received in the shadow round (CASSANDRA-16588) Merged from 3.0: + * CQL shell should prefer newer TLS version by default (CASSANDRA-16695) * Ensure that existing empty rows are properly returned (CASSANDRA-16671) * Failure to execute queries should emit a KPI other than read timeout/unavailable so it can be alerted/tracked (CASSANDRA-16581) - * Don't wait on schema versions from replacement target when replacing a node (CASSANDRA-16692) + * Don't wait on schema versions from replacement target when replacing a node * StandaloneVerifier does not fail when unable to verify SSTables, it only fails if Corruption is thrown (CASSANDRA-16683) * Fix bloom filter false ratio calculation by including true negatives (CASSANDRA-15834) * Prevent loss of commit log data when moving sstables between nodes (CASSANDRA-16619) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
