natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-5.0' into trunk

This commit is contained in:
Brandon Williams 2023-11-13 14:18:22 -06:00
parent c0e0ea1bc6 127f718797
commit c6cb8523b3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pylib/cqlshlib/cqlshmain.py
View File

@ -52,7 +52,10 @@ from cqlshlib.formatting import (DEFAULT_DATE_FORMAT, DEFAULT_NANOTIME_FORMAT,
from cqlshlib.helptopics import get_html_anchor, get_html_topics
from cqlshlib.tracing import print_trace, print_trace_session
from cqlshlib.util import get_file_encoding_bomsize, 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'
UTF8 = 'utf-8'