You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2021/05/05 12:22:56 UTC
[cassandra] branch trunk updated (930e9a1 -> 642e95a)
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 930e9a1 Merge branch 'cassandra-4.0' into trunk
new a3db118 Revert "Fix cqlsh DESC TYPE with non-ascii character in the identifier"
new 642e95a Merge branch 'cassandra-4.0' into trunk
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 -
bin/cqlsh.py | 18 +++++++-------
pylib/cqlshlib/copyutil.py | 2 +-
pylib/cqlshlib/test/test_cqlsh_completion.py | 5 +++-
pylib/cqlshlib/test/test_unicode.py | 35 +---------------------------
5 files changed, 16 insertions(+), 45 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 642e95a4a80e2ce43272e8fa8a02306ad7a267b8
Merge: 930e9a1 a3db118
Author: Brandon Williams <br...@apache.org>
AuthorDate: Wed May 5 07:22:36 2021 -0500
Merge branch 'cassandra-4.0' into trunk
CHANGES.txt | 1 -
bin/cqlsh.py | 18 +++++++-------
pylib/cqlshlib/copyutil.py | 2 +-
pylib/cqlshlib/test/test_cqlsh_completion.py | 5 +++-
pylib/cqlshlib/test/test_unicode.py | 35 +---------------------------
5 files changed, 16 insertions(+), 45 deletions(-)
diff --cc CHANGES.txt
index 17a13b5,2693388..923dd7f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,4 +1,6 @@@
-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:
- * Fix cqlsh DESC TYPE with non-ascii character in the identifier (CASSANDRA-16400)
* Fix cqlsh encoding error with unicode in multi-line statement (CASSANDRA-16539)
* Fix race in fat client removal (CASSANDRA-16238)
* Test org.apache.cassandra.net.AsyncPromiseTest FAILED (CASSANDRA-16596)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org