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 2e9ce1b88f8719787bf1ee69d5b491f0f2941135 Merge: 5d2c2f5 77a370c Author: Ekaterina Dimitrova <[email protected]> AuthorDate: Tue May 18 11:56:47 2021 -0400 Merge branch 'cassandra-4.0' into trunk CHANGES.txt | 1 + NEWS.txt | 2 ++ bin/cqlsh.py | 52 +++++++++++++++++++++++++++++----------------------- 3 files changed, 32 insertions(+), 23 deletions(-) diff --cc CHANGES.txt index cee36ce,1c3f3aa..0b09d35 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,5 +1,7 @@@ -4.0-rc2 +4.1 + * GossiperTest.testHasVersion3Nodes didn't take into account trunk version changes, fixed to rely on latest version (CASSANDRA-16651) +Merged from 4.0: + * Add a warning to cqlsh 6.0.0 that DESCRIBE does not work with a Cassandra 3.x servers (CASSANDRA-16652) * cqlsh: fix DESC TYPE with non-ascii character in the identifier (CASSANDRA-16400) * Remove drivers dependency and bring cql_keywords_reserved on server side (CASSANDRA-16659) * Fix in-browser "help", Python 3 (CASSANDRA-16658) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
