mirror of https://github.com/apache/cassandra
Merge branch 'cassandra-3.0' into cassandra-3.11
This commit is contained in:
commit
46996c24bf
|
|
@ -175,7 +175,10 @@ from cqlshlib.formatting import (DEFAULT_DATE_FORMAT, DEFAULT_NANOTIME_FORMAT,
|
|||
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
|
||||
try:
|
||||
from cqlshlib.serverversion import version as build_version
|
||||
except ImportError:
|
||||
build_version = "UNKNOWN"
|
||||
|
||||
DEFAULT_HOST = '127.0.0.1'
|
||||
DEFAULT_PORT = 9042
|
||||
|
|
|
|||
Loading…
Reference in New Issue