This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 5c44922a5a80130b8ddc0aee7437316675522d4b
Merge: afb422ddc0 a912085f5e
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Mon Nov 13 14:16:49 2023 -0600
Merge branch 'cassandra-4.0' into cassandra-4.1
bin/cqlsh.py | 4 ++++
1 file changed, 4 insertions(+)
diff --cc bin/cqlsh.py
index 0e00c44eab,dddbd397fa..328393eb58
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -151,13 -162,14 +151,17 @@@ from cqlshlib.displaying import (ANSI_R
RED, WHITE, FormattedValue, colorme)
from cqlshlib.formatting import (DEFAULT_DATE_FORMAT, DEFAULT_NANOTIME_FORMAT,
DEFAULT_TIMESTAMP_FORMAT, CqlType,
DateTimeFormat,
- format_by_type, formatter_for)
+ format_by_type)
from cqlshlib.tracing import print_trace, print_trace_session
-from cqlshlib.util import get_file_encoding_bomsize, trim_if_present
+from cqlshlib.util import get_file_encoding_bomsize
+from cqlshlib.util import is_file_secure
+from cqlshlib.serverversion import version as build_version
+ try:
+ from cqlshlib.serverversion import version as build_version
+ except ImportError:
+ build_version = "UNKNOWN"
+
DEFAULT_HOST = '127.0.0.1'
DEFAULT_PORT = 9042
DEFAULT_SSL = False
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
