Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 99A94185C8 for ; Mon, 2 Nov 2015 22:36:30 +0000 (UTC) Received: (qmail 76530 invoked by uid 500); 2 Nov 2015 22:36:28 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 76348 invoked by uid 500); 2 Nov 2015 22:36:28 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 75983 invoked by uid 99); 2 Nov 2015 22:36:28 -0000 Received: from arcas.apache.org (HELO arcas) (140.211.11.28) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Nov 2015 22:36:28 +0000 Received: from arcas.apache.org (localhost [127.0.0.1]) by arcas (Postfix) with ESMTP id 020892C1F63 for ; Mon, 2 Nov 2015 22:36:28 +0000 (UTC) Date: Mon, 2 Nov 2015 22:36:28 +0000 (UTC) From: "Jeremiah Jordan (JIRA)" To: commits@cassandra.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Commented] (CASSANDRA-10633) cqlsh copy uses wrong variable name for time_format MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/CASSANDRA-10633?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14986185#comment-14986185 ] Jeremiah Jordan commented on CASSANDRA-10633: --------------------------------------------- This commit is a bad back port to 2.1 from 2.2/3.0 https://github.com/apache/cassandra/commit/3c0a1a5c1a77ca1148bef1712a2859400d85ea8c >From CASSANDRA-8970 > cqlsh copy uses wrong variable name for time_format > --------------------------------------------------- > > Key: CASSANDRA-10633 > URL: https://issues.apache.org/jira/browse/CASSANDRA-10633 > Project: Cassandra > Issue Type: Bug > Components: Tools > Reporter: Jeremiah Jordan > Assignee: Jeremiah Jordan > Fix For: 2.1.x > > > {code} > diff --git a/bin/cqlsh b/bin/cqlsh > index ca45be3..ddf0314 100755 > --- a/bin/cqlsh > +++ b/bin/cqlsh > @@ -1816,7 +1816,7 @@ class Shell(cmd.Cmd): > encoding = opts.pop('encoding', 'utf8') > nullval = opts.pop('null', '') > header = bool(opts.pop('header', '').lower() == 'true') > - timestamp_format = opts.pop('time_format', self.display_timestamp_format) > + timestamp_format = opts.pop('time_format', self.display_time_format) > if dialect_options['quotechar'] == dialect_options['escapechar']: > dialect_options['doublequote'] = True > del dialect_options['escape char'] > {code} -- This message was sent by Atlassian JIRA (v6.3.4#6332)