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

Merge branch 'cassandra-4.0' into cassandra-4.1

This commit is contained in:
Stefan Miklosovic 2023-08-08 17:58:02 +02:00
parent d850cd7372 1e6df948a7
commit 8549f232b5
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -6,6 +6,7 @@ Merged from 4.0:
* Migrate Python optparse to argparse (CASSANDRA-17914) * Migrate Python optparse to argparse (CASSANDRA-17914)
Merged from 3.11: Merged from 3.11:
Merged from 3.0: Merged from 3.0:
* Fix CQLSH online help topic link (CASSANDRA-17534)
* Remove unused suppressions (CASSANDRA-18724) * Remove unused suppressions (CASSANDRA-18724)

2
bin/cqlsh.py
View File

@ -62,7 +62,7 @@ except ImportError:
CQL_LIB_PREFIX = 'cassandra-driver-internal-only-' CQL_LIB_PREFIX = 'cassandra-driver-internal-only-'
CASSANDRA_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), '..') CASSANDRA_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), '..')
CASSANDRA_CQL_HTML_FALLBACK = 'https://cassandra.apache.org/doc/latest/cql/index.html' CASSANDRA_CQL_HTML_FALLBACK = 'https://cassandra.apache.org/doc/latest/cassandra/cql/cql_singlefile.html'
# default location of local CQL.html # default location of local CQL.html
if os.path.exists(CASSANDRA_PATH + '/doc/cql3/CQL.html'): if os.path.exists(CASSANDRA_PATH + '/doc/cql3/CQL.html'):