Repository: cassandra Updated Branches: refs/heads/cassandra-3.11 75a932087 -> 845243db9 refs/heads/trunk fd44a69fc -> 09f3c969b
Fix cqlsh.py ssl flag regression patch by Stefan Podkowinski; reviewed by Jay Zhuang for CASSANDRA-14299 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/845243db Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/845243db Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/845243db Branch: refs/heads/cassandra-3.11 Commit: 845243db93a5add273f6edcf3cd0361c5f23cf0b Parents: 75a9320 Author: Stefan Podkowinski <stefan.podkowin...@1und1.de> Authored: Fri Mar 9 14:15:38 2018 +0100 Committer: Stefan Podkowinski <stefan.podkowin...@1und1.de> Committed: Tue Apr 17 10:46:57 2018 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/845243db/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index e55ae28..4c513d7 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/845243db/bin/cqlsh.py ---------------------------------------------------------------------- diff --git a/bin/cqlsh.py b/bin/cqlsh.py index 3abb3ba..801a8f7 100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@ -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) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
