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:
Stefan Miklosovic 2023-08-08 18:07:00 +02:00
parent 5a9b79bb83 ada67cb2a4
commit ab40d85cd1
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

@ -180,6 +180,7 @@ Merged from 4.0:
* Partial compaction can resurrect deleted data (CASSANDRA-18507) * Partial compaction can resurrect deleted data (CASSANDRA-18507)
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
pylib/cqlshlib/cqlshmain.py
View File

@ -2224,7 +2224,7 @@ def setup_cqlruleset(cqlmodule):
def setup_docspath(path): def setup_docspath(path):
global CASSANDRA_CQL_HTML global CASSANDRA_CQL_HTML
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(path + '/doc/cql3/CQL.html'): if os.path.exists(path + '/doc/cql3/CQL.html'):