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/04 13:53:57 UTC
[cassandra] branch trunk updated (48570e9 -> 58727f7)
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 48570e9 Merge branch 'cassandra-4.0' into trunk
new 288bb9d Fix cqlsh encoding error with unicode in multi-line statement
new 58727f7 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 | 2 +-
pylib/cqlshlib/test/cassconnect.py | 20 ++++++++-
pylib/cqlshlib/test/run_cqlsh.py | 1 +
pylib/cqlshlib/test/test_cqlsh_completion.py | 2 -
pylib/cqlshlib/test/test_cqlsh_output.py | 16 +++----
pylib/cqlshlib/test/test_unicode.py | 65 ++++++++++++++++++++++++++++
7 files changed, 93 insertions(+), 14 deletions(-)
create mode 100644 pylib/cqlshlib/test/test_unicode.py
---------------------------------------------------------------------
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 58727f71841d36020328602c0e64f0af361c5491
Merge: 48570e9 288bb9d
Author: Brandon Williams <br...@apache.org>
AuthorDate: Tue May 4 08:46:06 2021 -0500
Merge branch 'cassandra-4.0' into trunk
CHANGES.txt | 1 +
bin/cqlsh.py | 2 +-
pylib/cqlshlib/test/cassconnect.py | 20 ++++++++-
pylib/cqlshlib/test/run_cqlsh.py | 1 +
pylib/cqlshlib/test/test_cqlsh_completion.py | 2 -
pylib/cqlshlib/test/test_cqlsh_output.py | 16 +++----
pylib/cqlshlib/test/test_unicode.py | 65 ++++++++++++++++++++++++++++
7 files changed, 93 insertions(+), 14 deletions(-)
diff --cc CHANGES.txt
index 28439e2,2693388..c32cef7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
+4.1
+ * GossiperTest.testHasVersion3Nodes didn't take into account trunk version changes, fixed to rely on latest version (CASSANDRA-16651)
+Merged from 4.0:
+Merged from 3.11:
+Merged from 3.0:
+
+
4.0-rc2
+ * 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)
Merged from 3.11:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org