Fix cqlsh.py ssl flag regression

patch by Stefan Podkowinski; reviewed by Jay Zhuang for CASSANDRA-14299
This commit is contained in:
Stefan Podkowinski 2018-03-09 14:15:38 +01:00
parent 75a932087d
commit 845243db93
2 changed files with 2 additions and 1 deletions

View File

@ -1,4 +1,5 @@
3.11.3
* Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
* Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)
* CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
* Serialize empty buffer as empty string for json output format (CASSANDRA-14245)

View File

@ -2244,7 +2244,7 @@ def read_options(cmdlineargs, environment):
optvalues.debug = False
optvalues.file = None
optvalues.ssl = False
optvalues.ssl = option_with_default(configs.getboolean, 'connection', 'ssl', DEFAULT_SSL)
optvalues.no_compact = False
optvalues.encoding = option_with_default(configs.get, 'ui', 'encoding', UTF8)