From 53df3c118f4bb73494020b8414401540121a4c5d Mon Sep 17 00:00:00 2001 From: Alex Ott Date: Tue, 20 Feb 2018 13:23:21 +0100 Subject: [PATCH] fix for CASSANDRA-14243 `datetimeformat` option that was used in the `conf/cqlshrc.sample` file is sub-option of the `COPY FROM` command, not of the `cqlsh` itself. --- CHANGES.txt | 1 + conf/cqlshrc.sample | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 40b18aeb814c..ac8a2213351c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -192,6 +192,7 @@ * CQLSH: Don't pause when capturing data (CASSANDRA-13743) * nodetool clearsnapshot requires --all to clear all snapshots (CASSANDRA-13391) * Correctly count range tombstones in traces and tombstone thresholds (CASSANDRA-8527) + * cqlshrc.sample uses incorrect option for time formatting (CASSANDRA-14243) 3.11.3 * RateBasedBackPressure unnecessarily invokes a lock on the Guava RateLimiter (CASSANDRA-14163) diff --git a/conf/cqlshrc.sample b/conf/cqlshrc.sample index 0bf926f4a31c..0aa802dc86b1 100644 --- a/conf/cqlshrc.sample +++ b/conf/cqlshrc.sample @@ -30,7 +30,7 @@ ; color = on ;; Used for displaying timestamps (and reading them with COPY) -; datetimeformat = %Y-%m-%d %H:%M:%S%z +; time_format = %Y-%m-%d %H:%M:%S%z ;; Display timezone ;timezone = Etc/UTC