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 F184E1802F for ; Tue, 22 Mar 2016 20:52:48 +0000 (UTC) Received: (qmail 52384 invoked by uid 500); 22 Mar 2016 20:52:48 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 52321 invoked by uid 500); 22 Mar 2016 20:52:48 -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 51940 invoked by uid 99); 22 Mar 2016 20:52:48 -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, 22 Mar 2016 20:52:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6E78DDFC8E; Tue, 22 Mar 2016 20:52:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Tue, 22 Mar 2016 20:53:00 -0000 Message-Id: <07b2c4cbf42742afb9f0867c85e52830@git.apache.org> In-Reply-To: <9feae047c4fb4aca998d16faefdb2b92@git.apache.org> References: <9feae047c4fb4aca998d16faefdb2b92@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/13] cassandra git commit: Merge branch 'cassandra-3.5' into trunk Merge branch 'cassandra-3.5' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/207d08f8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/207d08f8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/207d08f8 Branch: refs/heads/trunk Commit: 207d08f86c5027a7dc332778b59e705adbab031f Parents: e24da8f 1ee5502 Author: Yuki Morishita Authored: Tue Mar 22 15:50:42 2016 -0500 Committer: Yuki Morishita Committed: Tue Mar 22 15:50:42 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/copyutil.py | 43 +++++++++++++++++++++++++++++++---------- 2 files changed, 34 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/207d08f8/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/207d08f8/pylib/cqlshlib/copyutil.py ----------------------------------------------------------------------