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 27FC718646 for ; Tue, 15 Dec 2015 21:40:44 +0000 (UTC) Received: (qmail 55175 invoked by uid 500); 15 Dec 2015 21:40:43 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 55091 invoked by uid 500); 15 Dec 2015 21:40:43 -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 54696 invoked by uid 99); 15 Dec 2015 21:40:43 -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; Tue, 15 Dec 2015 21:40:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1265EE0AF9; Tue, 15 Dec 2015 21:40:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Tue, 15 Dec 2015 21:40:47 -0000 Message-Id: <309f8f837780430f9167461f2d41b8e6@git.apache.org> In-Reply-To: <4115f26ea9da474881be60e27708b653@git.apache.org> References: <4115f26ea9da474881be60e27708b653@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] cassandra git commit: Merge branch 'cassandra-3.0' into trunk Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bab66dd1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bab66dd1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bab66dd1 Branch: refs/heads/trunk Commit: bab66dd1af377bec8aa3a144f19e925d4ecfa9cb Parents: a018bcb 1deb044 Author: Aleksey Yeschenko Authored: Tue Dec 15 21:40:32 2015 +0000 Committer: Aleksey Yeschenko Committed: Tue Dec 15 21:40:32 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 329 ++------------- pylib/cqlshlib/copyutil.py | 912 ++++++++++++++++++++++++++++++++++------ pylib/cqlshlib/util.py | 19 + 4 files changed, 840 insertions(+), 421 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bab66dd1/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index fb6f7e9,e167126..b3dc35b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -24,7 -3,12 +24,8 @@@ Merged from 3.0 (CASSANDRA-10822) Merged from 2.2 * Add property to allow listening on broadcast interface (CASSANDRA-9748) - * Fix regression in split size on CqlInputFormat (CASSANDRA-10835) - * Better handling of SSL connection errors inter-node (CASSANDRA-10816) - * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474) - * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761) Merged from 2.1: + * (cqlsh) further optimise COPY FROM (CASSANDRA-9302) * Allow CREATE TABLE WITH ID (CASSANDRA-9179) * Make Stress compiles within eclipse (CASSANDRA-10807) * Cassandra Daemon should print JVM arguments (CASSANDRA-10764) http://git-wip-us.apache.org/repos/asf/cassandra/blob/bab66dd1/bin/cqlsh.py ----------------------------------------------------------------------