This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 1dd38998a06887f47aa619bb84e98e531b9bf8fb
Merge: c870641475 6bb585bf5d
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Fri Aug 18 10:09:49 2023 -0500
Merge branch 'cassandra-3.0' into cassandra-3.11
.build/build-cqlsh.xml | 24 ++++++++++++++++++++++++
CHANGES.txt | 2 ++
bin/cqlsh.py | 11 +++++++++++
build.xml | 3 ++-
4 files changed, 39 insertions(+), 1 deletion(-)
diff --cc CHANGES.txt
index b8f489b183,702733eaaf..7ee07ec953
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,6 +1,20 @@@
+3.11.17
+Merged from 3.0:
+ 3.0.30
+ * CQLSH emits a warning when the server version doesn't match
(CASSANDRA-18745)
* Fix missing speculative retries in tablestats (CASSANDRA-18767)
+
+
+3.11.16
+ * Moved jflex from runtime to build dependencies (CASSANDRA-18664)
+ * Fix CAST function for float to decimal (CASSANDRA-18647)
+ * Suppress CVE-2022-45688 (CASSANDRA-18643)
+ * Remove unrepaired SSTables from garbage collection when
only_purge_repaired_tombstones is true (CASSANDRA-14204)
+ * Wait for live endpoints in gossip waiting to settle (CASSANDRA-18543)
+ * Fix error message handling when trying to use CLUSTERING ORDER with
non-clustering column (CASSANDRA-17818
+ * Add keyspace and table name to exception message during ColumnSubselection
deserialization (CASSANDRA-18346)
+ * Remove unnecessary String.format invocation in QueryProcessor when getting
a prepared statement from cache (CASSANDRA-17202)
+Merged from 3.0:
* Fix Requires for Java for RPM package (CASSANDRA-18751)
* Fix CQLSH online help topic link (CASSANDRA-17534)
* Remove unused suppressions (CASSANDRA-18724)
diff --cc bin/cqlsh.py
index ba32369529,f9fcc656d5..a2f1a9e5ed
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -166,15 -161,17 +166,16 @@@ cqlshlibdir = os.path.join(CASSANDRA_PA
if os.path.isdir(cqlshlibdir):
sys.path.insert(0, cqlshlibdir)
-from cqlshlib import cql3handling, cqlhandling, pylexotron, sslhandling
+from cqlshlib import cql3handling, cqlhandling, pylexotron, sslhandling,
cqlshhandling
from cqlshlib.copyutil import ExportTask, ImportTask
from cqlshlib.displaying import (ANSI_RESET, BLUE, COLUMN_NAME_COLORS, CYAN,
- RED, FormattedValue, colorme)
+ RED, WHITE, FormattedValue, colorme)
from cqlshlib.formatting import (DEFAULT_DATE_FORMAT, DEFAULT_NANOTIME_FORMAT,
- DEFAULT_TIMESTAMP_FORMAT, DateTimeFormat,
- format_by_type, format_value_utype,
- formatter_for)
+ DEFAULT_TIMESTAMP_FORMAT, CqlType,
DateTimeFormat,
+ format_by_type, formatter_for)
from cqlshlib.tracing import print_trace, print_trace_session
from cqlshlib.util import get_file_encoding_bomsize, trim_if_present
+ from cqlshlib.serverversion import version as build_version
DEFAULT_HOST = '127.0.0.1'
DEFAULT_PORT = 9042
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
