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 7AEA218BF9 for ; Thu, 19 Nov 2015 00:32:18 +0000 (UTC) Received: (qmail 93070 invoked by uid 500); 19 Nov 2015 00:32:13 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 93022 invoked by uid 500); 19 Nov 2015 00:32:13 -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 92717 invoked by uid 99); 19 Nov 2015 00:32:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Nov 2015 00:32:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BEE76E049D; Thu, 19 Nov 2015 00:32:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tylerhobbs@apache.org To: commits@cassandra.apache.org Date: Thu, 19 Nov 2015 00:32:17 -0000 Message-Id: <739e9258812e48c38615ba266fede858@git.apache.org> In-Reply-To: <5f1a709d06a9483b8595c679c465d9bb@git.apache.org> References: <5f1a709d06a9483b8595c679c465d9bb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1 Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7c68abcd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7c68abcd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7c68abcd Branch: refs/heads/cassandra-3.1 Commit: 7c68abcd8c868860097c73e3816b6ac9fcba6eac Parents: 02a12fa 74070ee Author: Tyler Hobbs Authored: Wed Nov 18 18:31:59 2015 -0600 Committer: Tyler Hobbs Committed: Wed Nov 18 18:31:59 2015 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 153 +++------ pylib/cqlshlib/copy.py | 647 ++++++++++++++++++++++++++++++++++++++ pylib/cqlshlib/displaying.py | 10 + pylib/cqlshlib/formatting.py | 32 +- 5 files changed, 725 insertions(+), 118 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c68abcd/CHANGES.txt ----------------------------------------------------------------------